wok-6.x diff busybox-pam/receipt @ rev 5960
gcc: update depends
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Aug 05 21:27:52 2010 +0200 (2010-08-05) |
parents | 4421c2206be7 |
children | 75dd5efa3105 |
line diff
1.1 --- a/busybox-pam/receipt Wed Jul 28 12:53:19 2010 +0200 1.2 +++ b/busybox-pam/receipt Thu Aug 05 21:27:52 2010 +0200 1.3 @@ -35,9 +35,13 @@ 1.4 EOT 1.5 cp $WOK/$SOURCE/stuff/$SOURCE-$VERSION.config .config 1.6 sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config 1.7 - make oldconfig 1.8 - # "CFLAGS=-O0" is a workaround for GCC 4.5.0 1.9 - make -j 4 "CFLAGS=-O0" && make "CFLAGS=-O0" install 1.10 + if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then 1.11 + # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash) 1.12 + # "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage) 1.13 + make -j 4 "CFLAGS=-O0" && make "CFLAGS=-O0" install 1.14 + else 1.15 + make -j 4 && make install 1.16 + fi 1.17 echo "Chmod 4755 on busybox binary..." 1.18 chmod 4755 _install/bin/busybox 1.19 } 1.20 @@ -93,7 +97,7 @@ 1.21 tazpkg get-install glibc-base --forced 1.22 fi 1.23 answer="" 1.24 - while read i ; do 1.25 + for i in $(cat $1$INSTALLED/$PACKAGE/files.list); do 1.26 [ -f $1$i ] || continue 1.27 case "$i" in 1.28 /bin/busybox) continue ;; 1.29 @@ -109,12 +113,13 @@ 1.30 esac 1.31 fi 1.32 cp -a $1$i $1$i-busybox-install 1.33 - done < $1$INSTALLED/$PACKAGE/files.list 1.34 + done 1.35 } 1.36 1.37 post_install() 1.38 { 1.39 local i 1.40 + [ -f /etc/resolv.conf-busybox-install ] && 1.41 mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf 1.42 while read i ; do 1.43 [ -f $1$i-busybox-install ] || continue