diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-08-02 12:42:58 +0400 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-08-02 12:42:58 +0400 |
commit | ff9b4a8981c4af9c6107ae4193c782ae3c94a23b (patch) | |
tree | d6b304098d3e3e0858e5199f78181cb207a4449e /debian | |
parent | fdbac35b332ae3e7789e2663d7e3b1144c061207 (diff) |
Scrub away the last leftovers from BB_FEATURE_<shell>. Good thing
for multibuild.pl -- I would have missed this stupid mess otherwise.
-Erik
Diffstat (limited to 'debian')
-rw-r--r-- | debian/Config.h-deb | 34 | ||||
-rw-r--r-- | debian/Config.h-static | 35 | ||||
-rw-r--r-- | debian/Config.h-udeb | 36 |
3 files changed, 45 insertions, 60 deletions
diff --git a/debian/Config.h-deb b/debian/Config.h-deb index 020f89d81..7fe9f9597 100644 --- a/debian/Config.h-deb +++ b/debian/Config.h-deb @@ -391,6 +391,19 @@ // Nothing beyond this point should ever be touched by // mere mortals so leave this stuff alone. // +#include <features.h> +#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ + #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ + #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ + #undef BB_ASH /* Uses fork() */ + #undef BB_HUSH /* Uses fork() */ + #undef BB_LASH /* Uses fork() */ + #undef BB_INIT /* Uses fork() */ + #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ + #undef BB_SYSLOGD /* Uses daemon() */ + #undef BB_KLOGD /* Uses daemon() */ + #undef BB_UPDATE /* Uses daemon() */ +#endif #if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH #if defined BB_FEATURE_COMMAND_EDITING #define BB_CMDEDIT @@ -400,26 +413,6 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #undef BB_FEATURE_SH_FANCY_PROMPT #endif - #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH - #define BB_FEATURE_MSH - #endif - #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #endif #else #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN #undef BB_FEATURE_SH_STANDALONE_SHELL @@ -471,3 +464,4 @@ # define BB_SH # define shell_main msh_main #endif + diff --git a/debian/Config.h-static b/debian/Config.h-static index a538b1a63..bbf4e577f 100644 --- a/debian/Config.h-static +++ b/debian/Config.h-static @@ -391,6 +391,19 @@ // Nothing beyond this point should ever be touched by // mere mortals so leave this stuff alone. // +#include <features.h> +#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ + #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ + #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ + #undef BB_ASH /* Uses fork() */ + #undef BB_HUSH /* Uses fork() */ + #undef BB_LASH /* Uses fork() */ + #undef BB_INIT /* Uses fork() */ + #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ + #undef BB_SYSLOGD /* Uses daemon() */ + #undef BB_KLOGD /* Uses daemon() */ + #undef BB_UPDATE /* Uses daemon() */ +#endif #if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH #if defined BB_FEATURE_COMMAND_EDITING #define BB_CMDEDIT @@ -400,26 +413,6 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #undef BB_FEATURE_SH_FANCY_PROMPT #endif - #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH - #define BB_FEATURE_MSH - #endif - #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #endif #else #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN #undef BB_FEATURE_SH_STANDALONE_SHELL @@ -471,3 +464,5 @@ # define BB_SH # define shell_main msh_main #endif + + diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb index 172d3dc75..74d4c7200 100644 --- a/debian/Config.h-udeb +++ b/debian/Config.h-udeb @@ -391,6 +391,19 @@ // Nothing beyond this point should ever be touched by // mere mortals so leave this stuff alone. // +#include <features.h> +#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ + #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ + #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ + #undef BB_ASH /* Uses fork() */ + #undef BB_HUSH /* Uses fork() */ + #undef BB_LASH /* Uses fork() */ + #undef BB_INIT /* Uses fork() */ + #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ + #undef BB_SYSLOGD /* Uses daemon() */ + #undef BB_KLOGD /* Uses daemon() */ + #undef BB_UPDATE /* Uses daemon() */ +#endif #if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH #if defined BB_FEATURE_COMMAND_EDITING #define BB_CMDEDIT @@ -400,26 +413,6 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #undef BB_FEATURE_SH_FANCY_PROMPT #endif - #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH - #define BB_FEATURE_MSH - #endif - #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #endif #else #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN #undef BB_FEATURE_SH_STANDALONE_SHELL @@ -471,3 +464,6 @@ # define BB_SH # define shell_main msh_main #endif + + + |