diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-10-05 00:27:49 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-10-05 00:27:49 +0000 |
| commit | f6327aee6385ead5f58362516cfc2032e4208b55 (patch) | |
| tree | 4d2e182e425873bcf891efcd1b3af569a158bedc /package/busybox/patches/401-darwin_includes.patch | |
| parent | 7d70e0ec58f7124bb4bc6cceadeffab92007e522 (diff) | |
| download | master-187ad058-f6327aee6385ead5f58362516cfc2032e4208b55.tar.gz master-187ad058-f6327aee6385ead5f58362516cfc2032e4208b55.tar.bz2 master-187ad058-f6327aee6385ead5f58362516cfc2032e4208b55.zip | |
Upgrade busybox to 1.7.2
- clean up insmod crap
- add some lineno/programname fixes for awx
- clean up awk getopt stuff
- remove unnecessary patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9130 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/401-darwin_includes.patch')
| -rw-r--r-- | package/busybox/patches/401-darwin_includes.patch | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/package/busybox/patches/401-darwin_includes.patch b/package/busybox/patches/401-darwin_includes.patch index f563e10863..6506f279b5 100644 --- a/package/busybox/patches/401-darwin_includes.patch +++ b/package/busybox/patches/401-darwin_includes.patch @@ -1,8 +1,8 @@ -Index: busybox-1.4.2/include/platform.h +Index: busybox-1.7.2/include/platform.h =================================================================== ---- busybox-1.4.2.orig/include/platform.h 2007-06-04 13:21:32.055103552 +0200 -+++ busybox-1.4.2/include/platform.h 2007-06-04 13:21:35.387596936 +0200 -@@ -128,9 +128,11 @@ +--- busybox-1.7.2.orig/include/platform.h 2007-09-03 13:48:46.000000000 +0200 ++++ busybox-1.7.2/include/platform.h 2007-10-04 15:20:58.301274440 +0200 +@@ -137,9 +137,11 @@ # include <netinet/in.h> #endif @@ -14,30 +14,20 @@ Index: busybox-1.4.2/include/platform.h /* ---- Compiler dependent settings ------------------------- */ #if (defined __digital__ && defined __unix__) -@@ -161,7 +163,7 @@ +@@ -179,7 +181,7 @@ #define HAVE_STDINT_H #else /* Largest integral types. */ -#if __BIG_ENDIAN__ +#if __BIG_ENDIAN__ && !__APPLE__ - typedef long int intmax_t; - typedef unsigned long int uintmax_t; + typedef long intmax_t; + typedef unsigned long uintmax_t; #else -Index: busybox-1.4.2/include/libbb.h +Index: busybox-1.7.2/include/libbb.h =================================================================== ---- busybox-1.4.2.orig/include/libbb.h 2007-06-04 13:21:32.062102488 +0200 -+++ busybox-1.4.2/include/libbb.h 2007-06-04 13:21:35.388596784 +0200 -@@ -17,7 +17,9 @@ - #include <errno.h> - #include <fcntl.h> - #include <inttypes.h> -+#ifndef __APPLE__ - #include <malloc.h> -+#endif - #include <netdb.h> - #include <setjmp.h> - #include <signal.h> -@@ -30,7 +32,9 @@ +--- busybox-1.7.2.orig/include/libbb.h 2007-09-16 20:48:10.000000000 +0200 ++++ busybox-1.7.2/include/libbb.h 2007-10-04 15:20:22.275221430 +0200 +@@ -31,7 +31,9 @@ #include <sys/mman.h> #include <sys/socket.h> #include <sys/stat.h> |