wok-6.x rev 16528

arm| --> arm*|
author Christophe Lincoln <pankso@slitaz.org>
date Sat Apr 26 11:02:15 2014 +0200 (2014-04-26)
parents 9aa78458e396
children 64284eab9a7b
files busybox/receipt bzip2/receipt glibc-base/receipt
line diff
     1.1 --- a/busybox/receipt	Sat Apr 26 08:05:20 2014 +0000
     1.2 +++ b/busybox/receipt	Sat Apr 26 11:02:15 2014 +0200
     1.3 @@ -21,7 +21,7 @@
     1.4  
     1.5  # Handle cross compilation
     1.6  case "$ARCH" in
     1.7 -	arm) BUILD_DEPENDS="bzip2" ;;
     1.8 +	arm*) BUILD_DEPENDS="bzip2" ;;
     1.9  esac
    1.10  
    1.11  # Busybox patches
    1.12 @@ -51,7 +51,7 @@
    1.13  compile_rules()
    1.14  {
    1.15  	case "$ARCH" in
    1.16 -		arm)
    1.17 +		arm*)
    1.18  			echo "cook: CROSS_COMPILE=$CROSS_COMPILE"
    1.19  			apply_bb_patchs &&
    1.20  			cp $stuff/arm/$PACKAGE.config .config
     2.1 --- a/bzip2/receipt	Sat Apr 26 08:05:20 2014 +0000
     2.2 +++ b/bzip2/receipt	Sat Apr 26 11:02:15 2014 +0200
     2.3 @@ -18,13 +18,13 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 -	cd $src
     2.8  	# Disable the tests since they won't work on a multi-architecture build
     2.9  	cp Makefile Makefile.orig
    2.10  	sed -e "/^all:/s/ test//" Makefile.orig > Makefile
    2.11 +	
    2.12  	# No configure script, we must used CC, AR and RANLIB set by cook.
    2.13  	case "$ARCH" in
    2.14 -		arm)
    2.15 +		arm*)
    2.16  			make -f Makefile-libbz2_so CC=${CC} AR=${AR} RANLIB=${RANLIB} &&
    2.17  			make clean && make CC=${CC} AR=${AR} RANLIB=${RANLIB} ;;
    2.18  		*)
     3.1 --- a/glibc-base/receipt	Sat Apr 26 08:05:20 2014 +0000
     3.2 +++ b/glibc-base/receipt	Sat Apr 26 11:02:15 2014 +0200
     3.3 @@ -15,12 +15,12 @@
     3.4  
     3.5  # Handle multiarch compilation.
     3.6  case "$ARCH" in
     3.7 -	arm|x86_64) VERSION="2.13" WANTED="" ;;
     3.8 +	arm*|x86_64) VERSION="2.13" WANTED="" ;;
     3.9  esac
    3.10  
    3.11  # Handle multiarch installation.
    3.12  case "$SLITAZ_ARCH" in
    3.13 -	arm|x86_64) VERSION="2.13" WANTED="" ;;
    3.14 +	arm*|x86_64) VERSION="2.13" WANTED="" ;;
    3.15  esac
    3.16  
    3.17  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.18 @@ -49,7 +49,7 @@
    3.19  	done
    3.20  
    3.21  	case "$ARCH" in
    3.22 -		arm)
    3.23 +		arm*)
    3.24  			# Eglibc is cross compiled by cross to have a toolchain so we can
    3.25  			# use these files instead of recooking it. ARM use Eglibc
    3.26  			echo "Using cross compiled Eglibc..."