diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rwxr-xr-x | applets/busybox.mkll | 2 | ||||
| -rwxr-xr-x | applets/busybox.sh | 2 | ||||
| -rwxr-xr-x | busybox.mkll | 2 | ||||
| -rwxr-xr-x | busybox.sh | 2 |
5 files changed, 6 insertions, 4 deletions
@@ -19,6 +19,8 @@ * Added usleep contributed by Nicolas Pitre <nico@cam.org> * tar wouldn't create directory entries that don't end in '/', now it does (thanks to Avery Pennarun <apenwarr@worldvisions.ca>) + * tar has been completely rewritten, and tar creation and extraction + is now much better behaved. * Several fixes from Pavel Roskin <pavel_roskin@geocities.com>: - When `tail' fails to open a file it now exits. - When `syslogd' is given the `-n' option it should still use diff --git a/applets/busybox.mkll b/applets/busybox.mkll index 90f28e8b7..fba0c8c81 100755 --- a/applets/busybox.mkll +++ b/applets/busybox.mkll @@ -5,7 +5,7 @@ DF="busybox.def.h" MF="busybox.c" #LIST="$(sed -n '/^#define/{s/^#define BB_FEATURE_.*//g;s/^#define //p;}' $DF)" -LIST="$(cpp $DF -dM | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1/gp;' | sort)" +LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1/gp;' | sort)" for def in ${LIST}; do i=`sed -n '/^#ifdef \<'$def'\>.*/,/^#endif/{ s/.*\"\(.*\)\".*\(_BB_DIR_[A-Z_]*\).*$/\2\/\1/gp; }' $MF` diff --git a/applets/busybox.sh b/applets/busybox.sh index c4e241f84..5dd6e1c3d 100755 --- a/applets/busybox.sh +++ b/applets/busybox.sh @@ -3,7 +3,7 @@ # I added in the extra "ls" so only source files that # actually exist will show up in the compile list. ls -1 ` \ - cpp busybox.def.h -dM | \ + gcc -E -dM busybox.def.h | \ sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1.c/gp;' \ | tr [:upper:] [:lower:] | sort ` 2>/dev/null | sed -e 's/\.c$/\.o/g' diff --git a/busybox.mkll b/busybox.mkll index 90f28e8b7..fba0c8c81 100755 --- a/busybox.mkll +++ b/busybox.mkll @@ -5,7 +5,7 @@ DF="busybox.def.h" MF="busybox.c" #LIST="$(sed -n '/^#define/{s/^#define BB_FEATURE_.*//g;s/^#define //p;}' $DF)" -LIST="$(cpp $DF -dM | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1/gp;' | sort)" +LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1/gp;' | sort)" for def in ${LIST}; do i=`sed -n '/^#ifdef \<'$def'\>.*/,/^#endif/{ s/.*\"\(.*\)\".*\(_BB_DIR_[A-Z_]*\).*$/\2\/\1/gp; }' $MF` diff --git a/busybox.sh b/busybox.sh index c4e241f84..5dd6e1c3d 100755 --- a/busybox.sh +++ b/busybox.sh @@ -3,7 +3,7 @@ # I added in the extra "ls" so only source files that # actually exist will show up in the compile list. ls -1 ` \ - cpp busybox.def.h -dM | \ + gcc -E -dM busybox.def.h | \ sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1.c/gp;' \ | tr [:upper:] [:lower:] | sort ` 2>/dev/null | sed -e 's/\.c$/\.o/g' |