SliTaz Repositories

     1.1 --- a/busybox/receipt	Thu Oct 31 11:37:30 2013 +0000
     1.2 +++ b/busybox/receipt	Sat Nov 02 10:57:20 2013 +0000
     1.3 @@ -42,7 +42,6 @@
     1.4  cmdline.u
     1.5  diff.u
     1.6  nfs-segfault.u
     1.7 -musl.u
     1.8  diet.u
     1.9  EOT
    1.10      cp $stuff/$PACKAGE-${VERSION%.*}.config .config
    1.11 @@ -84,7 +83,7 @@
    1.12  		    if [ -x /usr/bin/musl-gcc ]; then
    1.13  			# prepare busybox-musl package
    1.14  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.15 -			sed -i 's|uclibc-i486-||;s|CFLAGS="|&-D__musl__ |' .config
    1.16 +			sed -i 's|uclibc-i486-||' .config
    1.17  			make oldconfig && make CC=musl-gcc || return 1
    1.18  			mv busybox busybox-musl
    1.19  		    fi

     2.1 --- a/busybox/stuff/busybox-1.21-diet.u	Thu Oct 31 11:37:30 2013 +0000
     2.2 +++ b/busybox/stuff/busybox-1.21-diet.u	Sat Nov 02 10:57:20 2013 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4 ---- busybox-1.21.0/include/platform.h
     2.5 -+++ busybox-1.21.0/include/platform.h
     2.6 -@@ -460,6 +460,20 @@
     2.7 - # include <sys/ioctl.h>
     2.8 +--- busybox-1.21.1/include/platform.h
     2.9 ++++ busybox-1.21.1/include/platform.h
    2.10 +@@ -453,6 +453,20 @@
    2.11 + # undef HAVE_NET_ETHERNET_H
    2.12   #endif
    2.13   
    2.14  +#if defined(__dietlibc__)

     3.1 --- a/busybox/stuff/busybox-1.21-musl.u	Thu Oct 31 11:37:30 2013 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,40 +0,0 @@
     3.4 ---- busybox-1.21.0/include/platform.h
     3.5 -+++ busybox-1.21.0/include/platform.h
     3.6 -@@ -453,6 +453,13 @@
     3.7 - # undef HAVE_NET_ETHERNET_H
     3.8 - #endif
     3.9 - 
    3.10 -+#if defined(__musl__)
    3.11 -+# undef HAVE_SETBIT
    3.12 -+# include <stddef.h>
    3.13 -+# include <termios.h>
    3.14 -+# include <sys/ioctl.h>
    3.15 -+#endif
    3.16 -+
    3.17 - /*
    3.18 -  * Now, define prototypes for all the functions defined in platform.c
    3.19 -  * These must come after all the HAVE_* macros are defined (or not)
    3.20 ---- busybox-1.21.0/include/libbb.h
    3.21 -+++ busybox-1.21.0/include/libbb.h
    3.22 -@@ -210,6 +210,13 @@
    3.23 -  * (in today's world - signed 64bit). For full support of large files,
    3.24 -  * we need a few helper #defines (below) and careful use of off_t
    3.25 -  * instead of int/ssize_t. No lseek64(), O_LARGEFILE etc necessary */
    3.26 -+#if defined(__musl__)
    3.27 -+typedef unsigned long long uoff_t;
    3.28 -+#  define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
    3.29 -+#  define BB_STRTOOFF bb_strtoull
    3.30 -+#  define STRTOOFF strtoull
    3.31 -+#  define OFF_FMT "ll"
    3.32 -+#else
    3.33 - #if ENABLE_LFS
    3.34 - /* CONFIG_LFS is on */
    3.35 - # if ULONG_MAX > 0xffffffff
    3.36 -@@ -246,6 +253,7 @@
    3.37 - #  define STRTOOFF strtol
    3.38 - #  define OFF_FMT "l"
    3.39 - # endif
    3.40 -+#endif
    3.41 - #endif
    3.42 - /* scary. better ideas? (but do *test* them first!) */
    3.43 - #define OFF_T_MAX  ((off_t)~((off_t)1 << (sizeof(off_t)*8-1)))