wok diff busybox/receipt @ rev 8160
imported patch commit_inprogress/cyrus-sasl.patch
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Thu Jan 27 00:20:49 2011 +0100 (2011-01-27) |
parents | 1867cba0ced3 |
children | 890c8247a349 |
line diff
1.1 --- a/busybox/receipt Wed Jan 26 12:18:16 2011 +0000 1.2 +++ b/busybox/receipt Thu Jan 27 00:20:49 2011 +0100 1.3 @@ -12,6 +12,33 @@ 1.4 WGET_URL="http://www.busybox.net/downloads/$TARBALL" 1.5 CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf /etc/resolv.conf" 1.6 1.7 +# Rules to compile & install the temporary toolchain. 1.8 +cook_tmp_toolchain() 1.9 +{ 1.10 + cd $src 1.11 + while read file; do 1.12 + [ -f done.$file ] && continue 1.13 + echo "Apply $file..." 1.14 + patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1 1.15 + touch done.$file 1.16 + done <<EOT 1.17 +tar.u 1.18 +stat.u 1.19 +ris.u 1.20 +zmodules.u 1.21 +printable.u 1.22 +cmdline.u 1.23 +cpio.u 1.24 +EOT 1.25 + cp ../stuff/$PACKAGE-$VERSION.config .config 1.26 + { make oldconfig && 1.27 + make && 1.28 + make CONFIG_PREFIX=/tools install 1.29 + } || return 1 1.30 + echo "Chmod 4755 on busybox binary..." 1.31 + chmod 4755 /tools/bin/busybox 1.32 +} 1.33 + 1.34 # Rules to configure and make the package. 1.35 compile_rules() 1.36 { 1.37 @@ -32,26 +59,15 @@ 1.38 EOT 1.39 cp ../stuff/$PACKAGE-$VERSION.config .config 1.40 make oldconfig 1.41 - if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then 1.42 - # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash) 1.43 - # "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage) 1.44 - make -j 4 "CFLAGS=-O0" && make "CFLAGS=-O0" install 1.45 - else 1.46 - make -j 4 && make install 1.47 - fi 1.48 + make || return 1 1.49 + make install || return 1 1.50 sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config 1.51 make oldconfig 1.52 - if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then 1.53 - # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash) 1.54 - # "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage) 1.55 - make -j 4 "CFLAGS=-O0" 1.56 - else 1.57 - make -j 4 1.58 - fi 1.59 + make || return 1 1.60 mv busybox busybox-pam 1.61 cp ../stuff/$PACKAGE-$VERSION.config-static .config 1.62 make oldconfig 1.63 - make -j 4 1.64 + make || return 1 1.65 mv busybox busybox-static 1.66 } 1.67