# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1383389840 0
# Node ID 73d80d561b429859a2f8d5b5d0421fc2c3e15b24
# Parent  ce87c8a3d34acf4af05d204ec4d84ab30f6f44bf
busybox: remove musl patch

diff -r ce87c8a3d34a -r 73d80d561b42 busybox/receipt
--- a/busybox/receipt	Thu Oct 31 11:37:30 2013 +0000
+++ b/busybox/receipt	Sat Nov 02 10:57:20 2013 +0000
@@ -42,7 +42,6 @@
 cmdline.u
 diff.u
 nfs-segfault.u
-musl.u
 diet.u
 EOT
     cp $stuff/$PACKAGE-${VERSION%.*}.config .config
@@ -84,7 +83,7 @@
 		    if [ -x /usr/bin/musl-gcc ]; then
 			# prepare busybox-musl package
 			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
-			sed -i 's|uclibc-i486-||;s|CFLAGS="|&-D__musl__ |' .config
+			sed -i 's|uclibc-i486-||' .config
 			make oldconfig && make CC=musl-gcc || return 1
 			mv busybox busybox-musl
 		    fi
diff -r ce87c8a3d34a -r 73d80d561b42 busybox/stuff/busybox-1.21-diet.u
--- a/busybox/stuff/busybox-1.21-diet.u	Thu Oct 31 11:37:30 2013 +0000
+++ b/busybox/stuff/busybox-1.21-diet.u	Sat Nov 02 10:57:20 2013 +0000
@@ -1,7 +1,7 @@
---- busybox-1.21.0/include/platform.h
-+++ busybox-1.21.0/include/platform.h
-@@ -460,6 +460,20 @@
- # include <sys/ioctl.h>
+--- busybox-1.21.1/include/platform.h
++++ busybox-1.21.1/include/platform.h
+@@ -453,6 +453,20 @@
+ # undef HAVE_NET_ETHERNET_H
  #endif
  
 +#if defined(__dietlibc__)
diff -r ce87c8a3d34a -r 73d80d561b42 busybox/stuff/busybox-1.21-musl.u
--- a/busybox/stuff/busybox-1.21-musl.u	Thu Oct 31 11:37:30 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
---- busybox-1.21.0/include/platform.h
-+++ busybox-1.21.0/include/platform.h
-@@ -453,6 +453,13 @@
- # undef HAVE_NET_ETHERNET_H
- #endif
- 
-+#if defined(__musl__)
-+# undef HAVE_SETBIT
-+# include <stddef.h>
-+# include <termios.h>
-+# include <sys/ioctl.h>
-+#endif
-+
- /*
-  * Now, define prototypes for all the functions defined in platform.c
-  * These must come after all the HAVE_* macros are defined (or not)
---- busybox-1.21.0/include/libbb.h
-+++ busybox-1.21.0/include/libbb.h
-@@ -210,6 +210,13 @@
-  * (in today's world - signed 64bit). For full support of large files,
-  * we need a few helper #defines (below) and careful use of off_t
-  * instead of int/ssize_t. No lseek64(), O_LARGEFILE etc necessary */
-+#if defined(__musl__)
-+typedef unsigned long long uoff_t;
-+#  define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
-+#  define BB_STRTOOFF bb_strtoull
-+#  define STRTOOFF strtoull
-+#  define OFF_FMT "ll"
-+#else
- #if ENABLE_LFS
- /* CONFIG_LFS is on */
- # if ULONG_MAX > 0xffffffff
-@@ -246,6 +253,7 @@
- #  define STRTOOFF strtol
- #  define OFF_FMT "l"
- # endif
-+#endif
- #endif
- /* scary. better ideas? (but do *test* them first!) */
- #define OFF_T_MAX  ((off_t)~((off_t)1 << (sizeof(off_t)*8-1)))