# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1486635950 -3600
# Node ID d6dd7b81a69cd294e664bbb592e05263b3974964
# Parent  c1675701c99fd296d260a631e102ccf0b4c6aecb
busybox: dietlibc build is smaller than uclibc build, then aufs compatible

diff -r c1675701c99f -r d6dd7b81a69c busybox/receipt
--- a/busybox/receipt	Thu Feb 09 00:58:44 2017 +0200
+++ b/busybox/receipt	Thu Feb 09 11:25:50 2017 +0100
@@ -8,14 +8,12 @@
 LICENSE="GPL2"
 WEB_SITE="https://busybox.net/"
 HOST_ARCH="i486 arm"
-AUFS_NOT_RAMFS="uclibc-cross-compiler-i486 is not compatible with aufs+tmpfs 8("
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
 
 DEPENDS="slitaz-base-files glibc-base ncurses"
-BUILD_DEPENDS="bzip2 gettext perl pam pam-dev uclibc-cross-compiler-i486 \
-musl-libc-dev" # dietlibc
+BUILD_DEPENDS="bzip2 gettext perl pam pam-dev musl-libc-dev dietlibc"
 
 SPLIT="busybox-boot busybox-pam busybox-static ssfs-busybox busybox-slish"
 
@@ -87,7 +85,7 @@
 			mv docs/busybox.1 docs/busybox.pam.1
 
 			# prepare busybox-static package
-			if [ -x /usr/bin/uclibc-i486-gcc ]; then
+			if [ -n "$(/usr/bin/uclibc-i486-gcc --version 2>/dev/null)" ]; then
 				echo "Making busybox-uclibc"
 				cp $stuff/${VERSION%.*}/.config-static .config
 				sed -i 's|# CONFIG_ASH_INTERNAL_GLOB is not set|CONFIG_ASH_INTERNAL_GLOB=y|' .config
diff -r c1675701c99f -r d6dd7b81a69c busybox/stuff/1.26/diet.u
--- a/busybox/stuff/1.26/diet.u	Thu Feb 09 00:58:44 2017 +0200
+++ b/busybox/stuff/1.26/diet.u	Thu Feb 09 11:25:50 2017 +0100
@@ -1,11 +1,12 @@
---- busybox-1.25/include/platform.h
-+++ busybox-1.25/include/platform.h
-@@ -501,6 +501,20 @@
+--- busybox-1.26/include/platform.h
++++ busybox-1.26/include/platform.h
+@@ -501,6 +501,21 @@
  # undef HAVE_NET_ETHERNET_H
  #endif
  
 +#if defined(__dietlibc__)
 +# define __aligned_u64 __u64 __attribute__((aligned(8)))
++# define O_CLOEXEC 02000000
 +# define LOOP_SET_STATUS64	0x4C04
 +# define LOOP_GET_STATUS64	0x4C05
 +# define MAXSYMLINKS	20
@@ -21,8 +22,8 @@
  /*
   * 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.25/networking/ping.c
-+++ busybox-1.25/networking/ping.c
+--- busybox-1.26/networking/ping.c
++++ busybox-1.26/networking/ping.c
 @@ -30,6 +30,84 @@
  #include "libbb.h"
  #include "common_bufsiz.h"