wok-current diff busybox/receipt @ rev 13043

visualboyadvance: fix compile_rules
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jun 15 16:18:05 2012 +0200 (2012-06-15)
parents 3bdd365a98b0
children f5e71a92c2a8
line diff
     1.1 --- a/busybox/receipt	Mon May 28 10:03:33 2012 +0200
     1.2 +++ b/busybox/receipt	Fri Jun 15 16:18:05 2012 +0200
     1.3 @@ -12,14 +12,17 @@
     1.4  
     1.5  DEPENDS="slitaz-base-files glibc-base ncurses-common"
     1.6  BUILD_DEPENDS="bzip2 pam pam-dev uclibc-cross-compiler-i486"
     1.7 +
     1.8  CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf \
     1.9  /etc/resolv.conf /etc/httpd.conf"
    1.10  AUFS_NOT_SUPPORTED="uclibc-cross-compiler-i486 is not compatible with aufs 8("
    1.11  
    1.12 +# Handle cross compilation
    1.13  case "$ARCH" in
    1.14  	arm) BUILD_DEPENDS="bzip2" ;;
    1.15  esac
    1.16  
    1.17 +# Busybox patches
    1.18  apply_bb_patchs()
    1.19  {
    1.20      cd $src
    1.21 @@ -41,41 +44,23 @@
    1.22      cp $stuff/$PACKAGE-${VERSION%.*}.config .config
    1.23  }
    1.24  
    1.25 -# Rules to compile & install the temporary toolchain.
    1.26 -cook_tmp_toolchain()
    1.27 -{
    1.28 -    { stuff=${stuff:-../stuff}
    1.29 -    apply_bb_patchs &&
    1.30 -    make oldconfig &&
    1.31 -    make &&
    1.32 -    make CONFIG_PREFIX=/tools install
    1.33 -    } || return 1
    1.34 -    echo "Chmod 4755 on busybox binary..."
    1.35 -    chmod 4755 /tools/bin/busybox
    1.36 -}
    1.37 -
    1.38 -# Cook Busybox
    1.39 -cook_bb()
    1.40 -{
    1.41 -	{ apply_bb_patchs &&
    1.42 -	make oldconfig &&
    1.43 -	make && make install
    1.44 -	} || return 1
    1.45 -}
    1.46 -
    1.47  # Rules to configure and make the package.
    1.48  compile_rules()
    1.49  {
    1.50  	case "$ARCH" in
    1.51  		arm)
    1.52  			echo "cook: CROSS_COMPILE=$CROSS_COMPILE"
    1.53 -			cook_bb
    1.54 +			apply_bb_patchs &&
    1.55 +			cp $stuff/arm/$PACKAGE.config .config
    1.56 +			make oldconfig &&
    1.57 +			make && make install || return 1
    1.58  			chmod 4755 $src/_install/bin/busybox ;;
    1.59  		x86_64) echo "TODO" ;;
    1.60  		i?86)
    1.61 -			cook_bb
    1.62 -		    strip --strip-unneeded \
    1.63 -				-R .eh_frame -R .eh_frame_hdr \
    1.64 +			apply_bb_patchs &&
    1.65 +			make oldconfig &&
    1.66 +			make && make install || return 1
    1.67 +		    strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr \
    1.68  				$src/_install/bin/busybox
    1.69  
    1.70  			# prepare busybox-pam package