stage-0/busybox: bootstrap more utils

In stage 0, bootstrap a pretty complete tool collection, so that
we can bring ourselves the tools needed by the configure scripts
of the early stages.

1 files changed, 202 insertions, 155 deletions

diff --git a/src/bootstrap/include/stage-0-busybox.TARGETS b/src/bootstrap/include/stage-0-busybox.TARGETS
index c465c5a..203acf3 100644
--- a/src/bootstrap/include/stage-0-busybox.TARGETS
+++ b/src/bootstrap/include/stage-0-busybox.TARGETS
@@ -63,198 +63,245 @@
       , "#define CONFIG_PID_FILE_PATH \"\""
       , "#define CONFIG_FEATURE_EDITING_MAX_LEN 1024"
       , "#define CONFIG_SUBST_WCHAR 63"
+      , "#define CONFIG_UNAME_OSNAME \"GNU/Linux\""
       , ""
-      , "#define ENABLE_DESKTOP 0"
-      , "#define ENABLE_TAR 1"
-      , "#define ENABLE_ZCAT 0"
-      , "#define ENABLE_SELINUX 0"
-      , "#define ENABLE_KILLALL 0"
-      , "#define ENABLE_PGREP 0"
-      , "#define ENABLE_FGREP 0"
-      , "#define ENABLE_EGREP 0"
-      , "#define ENABLE_PKILL 0"
-      , "#define ENABLE_PIDOF 0"
-      , "#define ENABLE_SESTATUS 0"
-      , "#define ENABLE_SHA512SUM 0"
-      , "#define ENABLE_LOCALE_SUPPORT 0"
-      , "#define ENABLE_LONG_OPTS 0"
-      , "#define ENABLE_USE_BB_CRYPT_SHA 0"
-      , "#define ENABLE_ASH_OPTIMIZE_FOR_SIZE 1"
-      , "#define ENABLE_ASH_MAIL 0"
-      , "#define ENABLE_ASH_EXPAND_PRMT 1"
-      , "#define ENABLE_ASH_BASH_COMPAT 1"
-      , "#define ENABLE_ASH_HELP 1"
-      , "#define ENABLE_ASH_TEST 1"
       , "#define ENABLE_ASH_ALIAS 1"
-      , "#define ENABLE_ASH_JOB_CONTROL 1"
+      , "#define ENABLE_ASH_BASH_COMPAT 1"
+      , "#define ENABLE_ASH_BASH_NOT_FOUND_HOOK 1"
+      , "#define ENABLE_ASH_INTERNAL_GLOB 1"
       , "#define ENABLE_ASH_CMDCMD 1"
-      , "#define ENABLE_ASH_ECHO 1"
+      , "#define ENABLE_ASH_ECHO 0"
+      , "#define ENABLE_ASH_EXPAND_PRMT 1"
       , "#define ENABLE_ASH_GETOPTS 1"
-      , "#define ENABLE_ASH_RANDOM_SUPPORT 1"
-      , "#define ENABLE_KILLALL 1"
-      , "#define ENABLE_KILLALL5 1"
-      , "#define ENABLE_UNICODE_WIDE_WCHARS 0"
-      , "#define ENABLE_UNICODE_COMBINING_WCHARS 0"
-      , "#define ENABLE_UNICODE_SUPPORT 1"
-      , "#define ENABLE_UNICODE_USING_LOCALE 0"
-      , "#define ENABLE_TEST 1"
-      , "#define ENABLE_TEST1 1"
-      , "#define ENABLE_TEST2 1"
-      , "#define ENABLE_ASH_TEST 1"
-      , "#define ENABLE_HUSH_TEST 0"
-      , "#define ENABLE_FEATURE_VERBOSE 0"
-      , "#define ENABLE_FEATURE_SYSLOG 0"
-      , "#define ENABLE_FEATURE_CROND_D 0"
-      , "#define ENABLE_FEATURE_TOPMEM 0"
-      , "#define ENABLE_FEATURE_TOP_SMP_PROCESS 0"
-      , "#define ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS 0"
-      , "#define ENABLE_FEATURE_SHOW_THREADS 0"
-      , "#define ENABLE_FEATURE_CLEAN_UP 0"
-      , "#define ENABLE_FEATURE_PRESERVE_HARDLINKS 0"
-      , "#define ENABLE_FEATURE_NON_POSIX_CP 0"
-      , "#define ENABLE_FEATURE_USE_SENDFILE 0"
-      , "#define ENABLE_FEATURE_SKIP_ROOTFS 0"
-      , "#define ENABLE_FEATURE_MOUNT_LOOP_CREATE 0"
-      , "#define ENABLE_FEATURE_AWK_LIBM 0"
+      , "#define ENABLE_ASH_HELP 0"
+      , "#define ENABLE_ASH_JOB_CONTROL 1"
+      , "#define ENABLE_ASH_MAIL 0"
+      , "#define ENABLE_ASH_OPTIMIZE_FOR_SIZE 0"
+      , "#define ENABLE_ASH_PRINTF 0"
+      , "#define ENABLE_ASH_RANDOM_SUPPORT 0"
+      , "#define ENABLE_ASH_SLEEP 0"
+      , "#define ENABLE_ASH_TEST 0"
+      , "#define ENABLE_ASH_TEST 0"
+      , "#define ENABLE_BB_ARCH 1"
+      , "#define ENABLE_DESKTOP 1"
+      , "#define ENABLE_EGREP 0"
       , "#define ENABLE_FEATURE_ALLOW_EXEC 0"
-      , "#define ENABLE_FEATURE_SEAMLESS_XZ 0"
-      , "#define ENABLE_FEATURE_SEAMLESS_LZMA 0"
-      , "#define ENABLE_FEATURE_SEAMLESS_BZ2 0"
-      , "#define ENABLE_FEATURE_SEAMLESS_GZ 0"
-      , "#define ENABLE_FEATURE_SEAMLESS_Z 0"
-      , "#define ENABLE_FEATURE_TAR_CREATE 1"
-      , "#define ENABLE_FEATURE_TAR_FROM 0"
-      , "#define ENABLE_FEATURE_TAR_NOPRESERVE_TIME 0"
-      , "#define ENABLE_FEATURE_TAR_LONG_OPTIONS 0"
-      , "#define ENABLE_FEATURE_TAR_TO_COMMAND 0"
-      , "#define ENABLE_FEATURE_TAR_GNU_EXTENSIONS 0"
-      , "#define ENABLE_FEATURE_TAR_AUTODETECT 0"
-      , "#define ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY 0"
-      , "#define ENABLE_FEATURE_TAR_OLDSUN_COMPATIBILITY 0"
-      , "#define ENABLE_FEATURE_FIND_PATH 0"
-      , "#define ENABLE_FEATURE_FIND_REGEX 0"
-      , "#define ENABLE_FEATURE_FIND_PRINT0 0"
-      , "#define ENABLE_FEATURE_FIND_TYPE 1"
-      , "#define ENABLE_FEATURE_FIND_EXECUTABLE 0"
-      , "#define ENABLE_FEATURE_FIND_PERM 0"
-      , "#define ENABLE_FEATURE_FIND_MTIME 0"
-      , "#define ENABLE_FEATURE_FIND_CTIME 0"
+      , "#define ENABLE_FEATURE_AWK_GNU_EXTENSIONS 1"
+      , "#define ENABLE_FEATURE_AWK_LIBM 0"
+      , "#define ENABLE_FEATURE_BZIP2_DECOMPRESS 0"
+      , "#define ENABLE_FEATURE_CATN 0"
+      , "#define ENABLE_FEATURE_CATV 0"
+      , "#define ENABLE_FEATURE_CHECK_UNICODE_IN_ENV 0"
+      , "#define ENABLE_FEATURE_CLEAN_UP 0"
+      , "#define ENABLE_FEATURE_CROND_D 0"
+      , "#define ENABLE_FEATURE_DATE_ISOFMT 0"
+      , "#define ENABLE_FEATURE_EDITING 1"
+      , "#define ENABLE_FEATURE_EDITING_ASK_TERMINAL 0"
+      , "#define ENABLE_FEATURE_EDITING_MAX_LEN 1"
+      , "#define ENABLE_FEATURE_EDITING_VI 0"
+      , "#define ENABLE_FEATURE_EDITING_WINCH 1"
+      , "#define ENABLE_FEATURE_FANCY_ECHO 1"
+      , "#define ENABLE_FEATURE_FANCY_TAIL 1"
+      , "#define ENABLE_FEATURE_FIND_AMIN 0"
       , "#define ENABLE_FEATURE_FIND_ATIME 0"
-      , "#define ENABLE_FEATURE_FIND_MMIN 0"
       , "#define ENABLE_FEATURE_FIND_CMIN 0"
-      , "#define ENABLE_FEATURE_FIND_AMIN 0"
-      , "#define ENABLE_FEATURE_FIND_NEWER 0"
-      , "#define ENABLE_FEATURE_FIND_INUM 0"
-      , "#define ENABLE_FEATURE_FIND_SAMEFILE 0"
-      , "#define ENABLE_FEATURE_FIND_USER 0"
-      , "#define ENABLE_FEATURE_FIND_SIZE 0"
       , "#define ENABLE_FEATURE_FIND_CONTEXT 0"
-      , "#define ENABLE_FEATURE_FIND_PAREN 1"
-      , "#define ENABLE_FEATURE_FIND_PRUNE 1"
-      , "#define ENABLE_FEATURE_FIND_QUIT 0"
+      , "#define ENABLE_FEATURE_FIND_CTIME 0"
       , "#define ENABLE_FEATURE_FIND_DELETE 0"
+      , "#define ENABLE_FEATURE_FIND_DEPTH 0"
       , "#define ENABLE_FEATURE_FIND_EMPTY 0"
-      , "#define ENABLE_FEATURE_FIND_EXEC 0"
-      , "#define ENABLE_FEATURE_FIND_EXEC_PLUS 0"
+      , "#define ENABLE_FEATURE_FIND_EXEC 1"
+      , "#define ENABLE_FEATURE_FIND_EXEC_PLUS 1"
+      , "#define ENABLE_FEATURE_FIND_EXECUTABLE 0"
       , "#define ENABLE_FEATURE_FIND_GROUP 0"
+      , "#define ENABLE_FEATURE_FIND_INUM 0"
       , "#define ENABLE_FEATURE_FIND_LINKS 0"
-      , "#define ENABLE_FEATURE_FIND_NOT 1"
-      , "#define ENABLE_FEATURE_FIND_DEPTH 0"
       , "#define ENABLE_FEATURE_FIND_MAXDEPTH 0"
+      , "#define ENABLE_FEATURE_FIND_MMIN 0"
+      , "#define ENABLE_FEATURE_FIND_MTIME 0"
+      , "#define ENABLE_FEATURE_FIND_NEWER 0"
+      , "#define ENABLE_FEATURE_FIND_NOT 1"
+      , "#define ENABLE_FEATURE_FIND_PAREN 1"
+      , "#define ENABLE_FEATURE_FIND_PATH 0"
+      , "#define ENABLE_FEATURE_FIND_PERM 0"
+      , "#define ENABLE_FEATURE_FIND_PRINT0 0"
+      , "#define ENABLE_FEATURE_FIND_PRUNE 1"
+      , "#define ENABLE_FEATURE_FIND_QUIT 0"
+      , "#define ENABLE_FEATURE_FIND_REGEX 0"
+      , "#define ENABLE_FEATURE_FIND_SAMEFILE 0"
+      , "#define ENABLE_FEATURE_FIND_SIZE 0"
+      , "#define ENABLE_FEATURE_FIND_TYPE 1"
+      , "#define ENABLE_FEATURE_FIND_USER 0"
       , "#define ENABLE_FEATURE_FIND_XDEV 0"
-      , "#define ENABLE_FEATURE_BZIP2_DECOMPRESS 0"
-      , "#define ENABLE_FEATURE_SH_READ_FRAC 1"
+      , "#define ENABLE_FEATURE_HUMAN_READABLE 0"
+      , "#define ENABLE_FEATURE_LESS_ASK_TERMINAL 1"
+      , "#define ENABLE_FEATURE_LS_COLOR 0"
+      , "#define ENABLE_FEATURE_LS_FILETYPES 0"
+      , "#define ENABLE_FEATURE_LS_FOLLOWLINKS 0"
+      , "#define ENABLE_FEATURE_LS_RECURSIVE 0"
+      , "#define ENABLE_FEATURE_LS_SORTFILES 1"
+      , "#define ENABLE_FEATURE_LS_TIMESTAMPS 1"
+      , "#define ENABLE_FEATURE_LS_WIDTH 0"
+      , "#define ENABLE_FEATURE_MOUNT_LOOP_CREATE 0"
+      , "#define ENABLE_FEATURE_NON_POSIX_CP 0"
+      , "#define ENABLE_FEATURE_PRESERVE_HARDLINKS 0"
+      , "#define ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS 0"
+      , "#define ENABLE_FEATURE_SEAMLESS_BZ2 0"
+      , "#define ENABLE_FEATURE_SEAMLESS_GZ 0"
+      , "#define ENABLE_FEATURE_SEAMLESS_LZMA 0"
+      , "#define ENABLE_FEATURE_SEAMLESS_XZ 0"
+      , "#define ENABLE_FEATURE_SEAMLESS_Z 0"
       , "#define ENABLE_FEATURE_SH_MATH 1"
+      , "#define ENABLE_FEATURE_SHOW_THREADS 0"
+      , "#define ENABLE_FEATURE_SH_READ_FRAC 0"
       , "#define ENABLE_FEATURE_SH_STANDALONE 0"
-      , "#define ENABLE_FEATURE_EDITING 1"
+      , "#define ENABLE_FEATURE_SKIP_ROOTFS 0"
+      , "#define ENABLE_FEATURE_SORT_BIG 1"
+      , "#define ENABLE_FEATURE_SYSLOG 0"
       , "#define ENABLE_FEATURE_TAB_COMPLETION 0"
+      , "#define ENABLE_FEATURE_TAR_AUTODETECT 0"
+      , "#define ENABLE_FEATURE_TAR_CREATE 1"
+      , "#define ENABLE_FEATURE_TAR_FROM 0"
+      , "#define ENABLE_FEATURE_TAR_GNU_EXTENSIONS 0"
+      , "#define ENABLE_FEATURE_TAR_LONG_OPTIONS 0"
+      , "#define ENABLE_FEATURE_TAR_NOPRESERVE_TIME 0"
+      , "#define ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY 0"
+      , "#define ENABLE_FEATURE_TAR_OLDSUN_COMPATIBILITY 0"
+      , "#define ENABLE_FEATURE_TAR_TO_COMMAND 0"
+      , "#define ENABLE_FEATURE_TOPMEM 0"
+      , "#define ENABLE_FEATURE_TOP_SMP_PROCESS 0"
+      , "#define ENABLE_FEATURE_TOUCH_SUSV3 0"
+      , "#define ENABLE_FEATURE_TR_CLASSES 0"
+      , "#define ENABLE_FEATURE_TR_EQUIV 0"
       , "#define ENABLE_FEATURE_USERNAME_COMPLETION 0"
-      , "#define ENABLE_FEATURE_EDITING_VI 0"
-      , "#define ENABLE_FEATURE_EDITING_MAX_LEN 1"
-      , "#define ENABLE_FEATURE_EDITING_WINCH 1"
-      , "#define ENABLE_FEATURE_EDITING_ASK_TERMINAL 0"
+      , "#define ENABLE_FEATURE_USE_SENDFILE 0"
+      , "#define ENABLE_FEATURE_VERBOSE 0"
       , "#define ENABLE_FEATURE_VI_ASK_TERMINAL 1"
-      , "#define ENABLE_FEATURE_LESS_ASK_TERMINAL 1"
-      , "#define ENABLE_FEATURE_CHECK_UNICODE_IN_ENV 0"
+      , "#define ENABLE_FGREP 0"
+      , "#define ENABLE_FTPD 0"
+      , "#define ENABLE_HUSH_PRINTF 0"
+      , "#define ENABLE_HUSH_TEST 0"
+      , "#define ENABLE_KILL 1"
+      , "#define ENABLE_KILLALL 1"
+      , "#define ENABLE_KILLALL5 1"
+      , "#define ENABLE_LOCALE_SUPPORT 0"
+      , "#define ENABLE_LONG_OPTS 1"
+      , "#define ENABLE_PGREP 0"
+      , "#define ENABLE_PIDOF 0"
+      , "#define ENABLE_PKILL 0"
+      , "#define ENABLE_SELINUX 0"
+      , "#define ENABLE_SESTATUS 0"
+      , "#define ENABLE_SHA512SUM 0"
+      , "#define ENABLE_TAR 1"
+      , "#define ENABLE_TEST 1"
+      , "#define ENABLE_TEST1 1"
+      , "#define ENABLE_TEST2 1"
+      , "#define ENABLE_UNAME 1"
+      , "#define ENABLE_UNICODE_COMBINING_WCHARS 0"
+      , "#define ENABLE_UNICODE_SUPPORT 1"
+      , "#define ENABLE_UNICODE_USING_LOCALE 0"
+      , "#define ENABLE_UNICODE_WIDE_WCHARS 0"
+      , "#define ENABLE_USE_BB_CRYPT_SHA 0"
+      , "#define ENABLE_ZCAT 0"
       , ""
-      , "#define IF_DESKTOP(...)"
-      , "#define IF_NOT_DESKTOP(...) __VA_ARGS__"
-      , "#define IF_SHELL_ASH(...) __VA_ARGS__"
-      , "#define IF_SHELL_HUSH(...)"
-      , "#define IF_ECHO(...)"
-      , "#define IF_SLEEP(...)"
-      , "#define IF_PRINTF(...)"
+      , "#define IF_ASH_BASH_COMPAT(...) __VA_ARGS__"
+      , "#define IF_ASH_EXPAND_PRMT(...) __VA_ARGS__"
+      , "#define IF_ASH_HELP(...)"
       , "#define IF_CHOWN(...)"
-      , "#define IF_LS(...)"
-      , "#define IF_SELINUX(...)"
+      , "#define IF_DESKTOP(...) __VA_ARGS__"
+      , "#define IF_ECHO(...)"
       , "#define IF_EXTRA_COMPAT(...)"
-      , "#define IF_NOT_ASH_OPTIMIZE_FOR_SIZE(...)"
-      , "#define IF_ASH_EXPAND_PRMT(...) __VA_ARGS__"
-      , "#define IF_ASH_BASH_COMPAT(...) __VA_ARGS__"
-      , "#define IF_ASH_HELP(...) __VA_ARGS__"
-      , "#define IF_UNICODE_WIDE_WCHARS(...)"
-      , "#define IF_FEATURE_SHOW_THREADS(...)"
+      , "#define IF_FEATURE_AWK_GNU_EXTENSIONS(...) __VA_ARGS__"
+      , "#define IF_FEATURE_BZIP2_DECOMPRESS(...)"
+      , "#define IF_FEATURE_CATN(...)"
+      , "#define IF_FEATURE_CATV(...)"
       , "#define IF_FEATURE_CP_REFLINK(...)"
-      , "#define IF_FEATURE_SHADOWPASSWDS(...)"
-      , "#define IF_FEATURE_MTAB_SUPPORT(...)"
-      , "#define IF_FEATURE_SKIP_ROOTFS(...)"
-      , "#define IF_FEATURE_MOUNT_LOOP_CREATE(...)"
-      , "#define IF_FEATURE_TIMEZONE(...)"
-      , "#define IF_FEATURE_AWK_GNU_EXTENSIONS(...)"
-      , "#define IF_FEATURE_GREP_CONTEXT(...)"
-      , "#define IF_FEATURE_SEAMLESS_XZ(...)"
-      , "#define IF_FEATURE_SEAMLESS_LZMA(...)"
-      , "#define IF_FEATURE_SEAMLESS_BZ2(...)"
-      , "#define IF_FEATURE_SEAMLESS_GZ(...)"
-      , "#define IF_FEATURE_SEAMLESS_Z(...)"
-      , "#define IF_FEATURE_TAR_CREATE(...) __VA_ARGS__"
-      , "#define IF_FEATURE_TAR_FROM(...)"
-      , "#define IF_FEATURE_TAR_NOPRESERVE_TIME(...)"
-      , "#define IF_FEATURE_TAR_LONG_OPTIONS(...)"
-      , "#define IF_FEATURE_TAR_TO_COMMAND(...)"
-      , "#define IF_NOT_FEATURE_TAR_CREATE(...)"
-      , "#define IF_FEATURE_TAR_OLDGNU_COMPATIBILITY(...)"
-      , "#define IF_FEATURE_TAR_OLDSUN_COMPATIBILITY(...)"
-      , "#define IF_FEATURE_FIND_PATH(...)"
-      , "#define IF_FEATURE_FIND_REGEX(...)"
-      , "#define IF_FEATURE_FIND_PRINT0(...)"
-      , "#define IF_FEATURE_FIND_TYPE(...) __VA_ARGS__"
-      , "#define IF_FEATURE_FIND_EXECUTABLE(...)"
-      , "#define IF_FEATURE_FIND_PERM(...)"
-      , "#define IF_FEATURE_FIND_MTIME(...)"
-      , "#define IF_FEATURE_FIND_CTIME(...)"
+      , "#define IF_FEATURE_DATE_ISOFMT(...)"
+      , "#define IF_FEATURE_EDITING_VI(...)"
+      , "#define IF_FEATURE_EDITING_WINCH(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FANCY_TAIL(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_AMIN(...)"
       , "#define IF_FEATURE_FIND_ATIME(...)"
-      , "#define IF_FEATURE_FIND_MMIN(...)"
       , "#define IF_FEATURE_FIND_CMIN(...)"
-      , "#define IF_FEATURE_FIND_AMIN(...)"
-      , "#define IF_FEATURE_FIND_NEWER(...)"
-      , "#define IF_FEATURE_FIND_INUM(...)"
-      , "#define IF_FEATURE_FIND_SAMEFILE(...)"
-      , "#define IF_FEATURE_FIND_USER(...)"
-      , "#define IF_FEATURE_FIND_SIZE(...)"
       , "#define IF_FEATURE_FIND_CONTEXT(...)"
-      , "#define IF_FEATURE_FIND_PAREN(...) __VA_ARGS__"
-      , "#define IF_FEATURE_FIND_PRUNE(...) __VA_ARGS__"
-      , "#define IF_FEATURE_FIND_QUIT(...)"
+      , "#define IF_FEATURE_FIND_CTIME(...)"
       , "#define IF_FEATURE_FIND_DELETE(...)"
+      , "#define IF_FEATURE_FIND_DEPTH(...)"
       , "#define IF_FEATURE_FIND_EMPTY(...)"
-      , "#define IF_FEATURE_FIND_EXEC(...)"
-      , "#define IF_FEATURE_FIND_EXEC_PLUS(...)"
+      , "#define IF_FEATURE_FIND_EXEC(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_EXEC_PLUS(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_EXECUTABLE(...)"
       , "#define IF_FEATURE_FIND_GROUP(...)"
+      , "#define IF_FEATURE_FIND_INUM(...)"
       , "#define IF_FEATURE_FIND_LINKS(...)"
-      , "#define IF_FEATURE_FIND_NOT(...) __VA_ARGS__"
-      , "#define IF_FEATURE_FIND_DEPTH(...)"
       , "#define IF_FEATURE_FIND_MAXDEPTH(...)"
-      , "#define IF_NOT_FEATURE_FIND_MAXDEPTH(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_MMIN(...)"
+      , "#define IF_FEATURE_FIND_MTIME(...)"
+      , "#define IF_FEATURE_FIND_NEWER(...)"
+      , "#define IF_FEATURE_FIND_NOT(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_PAREN(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_PATH(...)"
+      , "#define IF_FEATURE_FIND_PERM(...)"
+      , "#define IF_FEATURE_FIND_PRINT0(...)"
+      , "#define IF_FEATURE_FIND_PRUNE(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_QUIT(...)"
+      , "#define IF_FEATURE_FIND_REGEX(...)"
+      , "#define IF_FEATURE_FIND_SAMEFILE(...)"
+      , "#define IF_FEATURE_FIND_SIZE(...)"
+      , "#define IF_FEATURE_FIND_TYPE(...) __VA_ARGS__"
+      , "#define IF_FEATURE_FIND_USER(...)"
       , "#define IF_FEATURE_FIND_XDEV(...)"
-      , "#define IF_FEATURE_BZIP2_DECOMPRESS(...)"
+      , "#define IF_FEATURE_GREP_CONTEXT(...)"
+      , "#define IF_FEATURE_HUMAN_READABLE(...)"
+      , "#define IF_FEATURE_INSTALL_LONG_OPTIONS(...) __VA_ARGS__"
+      , "#define IF_FEATURE_LS_COLOR(...)"
+      , "#define IF_FEATURE_LS_FILETYPES(...)"
+      , "#define IF_FEATURE_LS_FOLLOWLINKS(...)"
+      , "#define IF_FEATURE_LS_RECURSIVE(...)"
+      , "#define IF_FEATURE_LS_SORTFILES(...) __VA_ARGS__"
+      , "#define IF_FEATURE_LS_TIMESTAMPS(...) __VA_ARGS__"
+      , "#define IF_FEATURE_LS_WIDTH(...)"
+      , "#define IF_FEATURE_MOUNT_LOOP_CREATE(...)"
+      , "#define IF_FEATURE_MTAB_SUPPORT(...)"
+      , "#define IF_FEATURE_SEAMLESS_BZ2(...)"
+      , "#define IF_FEATURE_SEAMLESS_GZ(...)"
+      , "#define IF_FEATURE_SEAMLESS_LZMA(...)"
+      , "#define IF_FEATURE_SEAMLESS_XZ(...)"
+      , "#define IF_FEATURE_SEAMLESS_Z(...)"
+      , "#define IF_FEATURE_SHADOWPASSWDS(...)"
       , "#define IF_FEATURE_SH_MATH(...) __VA_ARGS__"
+      , "#define IF_FEATURE_SHOW_THREADS(...)"
       , "#define IF_FEATURE_SH_STANDALONE(...)"
-      , "#define IF_FEATURE_EDITING_VI(...)"
-      , "#define IF_FEATURE_EDITING_WINCH(...) __VA_ARGS__"
+      , "#define IF_FEATURE_SKIP_ROOTFS(...)"
+      , "#define IF_FEATURE_TAR_AUTODETECT(...)"
+      , "#define IF_FEATURE_TAR_CREATE(...) __VA_ARGS__"
+      , "#define IF_FEATURE_TAR_FROM(...)"
+      , "#define IF_FEATURE_TAR_LONG_OPTIONS(...)"
+      , "#define IF_FEATURE_TAR_NOPRESERVE_TIME(...)"
+      , "#define IF_FEATURE_TAR_OLDGNU_COMPATIBILITY(...)"
+      , "#define IF_FEATURE_TAR_OLDSUN_COMPATIBILITY(...)"
+      , "#define IF_FEATURE_TAR_TO_COMMAND(...)"
+      , "#define IF_FEATURE_TIMEZONE(...)"
+      , "#define IF_FEATURE_TOUCH_SUSV3(...)"
+      , "#define IF_FEATURE_VERBOSE(...)"
+      , "#define IF_LONG_OPTS(...) __VA_ARGS__"
+      , "#define IF_LS(...)"
+      , "#define IF_NOT_ASH_OPTIMIZE_FOR_SIZE(...) __VA_ARGS__"
+      , "#define IF_NOT_DESKTOP(...)"
+      , "#define IF_NOT_FEATURE_FIND_MAXDEPTH(...) __VA_ARGS__"
+      , "#define IF_NOT_FEATURE_TAR_CREATE(...)"
+      , "#define IF_NOT_FEATURE_TOUCH_SUSV3(...) __VA_ARGS__"
+      , "#define IF_PRINTF(...) __VA_ARGS__"
+      , "#define IF_SELINUX(...)"
+      , "#define IF_SHELL_ASH(...) __VA_ARGS__"
+      , "#define IF_SHELL_HUSH(...)"
+      , "#define IF_SLEEP(...)"
+      , "#define IF_UNAME(...) __VA_ARGS__"
+      , "#define IF_UNICODE_WIDE_WCHARS(...)"
       , ""
       , "/* missing declarations */"
       , "char *strchrnul(const char *s, int c);"
+      , "#include <getopt.h>"
       , ""
       , "/* include original libbb.h */"
       , "#include \"original/libbb.h\""