wok-current diff busybox/receipt @ rev 5711
busybox: add conspy
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Jun 23 21:48:13 2010 +0200 (2010-06-23) |
parents | 52dc580d9edb |
children | 609498d2778d |
line diff
1.1 --- a/busybox/receipt Sat Jun 05 15:38:11 2010 +0200 1.2 +++ b/busybox/receipt Wed Jun 23 21:48:13 2010 +0200 1.3 @@ -36,8 +36,13 @@ 1.4 EOT 1.5 cp ../stuff/$PACKAGE-$VERSION.config .config 1.6 make oldconfig 1.7 - # "CFLAGS=-O0" is a workaround for GCC 4.5.0 1.8 - make -j 4 "CFLAGS=-O0" && make "CFLAGS=-O0" install 1.9 + if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then 1.10 + # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crach) 1.11 + # "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage) 1.12 + make -j 4 "CFLAGS=-O0" && make "CFLAGS=-O0" install 1.13 + else 1.14 + make -j 4 && make install 1.15 + fi 1.16 echo "Chmod 4755 on busybox binary..." 1.17 chmod 4755 _install/bin/busybox 1.18 } 1.19 @@ -88,10 +93,10 @@ 1.20 [ -e $ROOT$i ] || continue 1.21 if [ -z "$answer" ]; then 1.22 echo -n "Keep installed GNU utilities ? " 1.23 - read answer 1.24 + read -t 30 answer # by default: keep 1.25 case "$answer" in 1.26 - y*|Y*|o*|O*);; 1.27 - *) break;; 1.28 + n*|N*) break;; 1.29 + *) ;; 1.30 esac 1.31 fi 1.32 mv $ROOT$i $ROOT$i-busybox-install