# HG changeset patch # User Christophe Lincoln # Date 1398502935 -7200 # Node ID 906854cfa70da39c977d2a052990e4619c05b4ca # Parent 9aa78458e396d24b465de80f1005d2d8024700a8 arm| --> arm*| diff -r 9aa78458e396 -r 906854cfa70d busybox/receipt --- a/busybox/receipt Sat Apr 26 08:05:20 2014 +0000 +++ b/busybox/receipt Sat Apr 26 11:02:15 2014 +0200 @@ -21,7 +21,7 @@ # Handle cross compilation case "$ARCH" in - arm) BUILD_DEPENDS="bzip2" ;; + arm*) BUILD_DEPENDS="bzip2" ;; esac # Busybox patches @@ -51,7 +51,7 @@ compile_rules() { case "$ARCH" in - arm) + arm*) echo "cook: CROSS_COMPILE=$CROSS_COMPILE" apply_bb_patchs && cp $stuff/arm/$PACKAGE.config .config diff -r 9aa78458e396 -r 906854cfa70d bzip2/receipt --- a/bzip2/receipt Sat Apr 26 08:05:20 2014 +0000 +++ b/bzip2/receipt Sat Apr 26 11:02:15 2014 +0200 @@ -18,13 +18,13 @@ # Rules to configure and make the package. compile_rules() { - cd $src # Disable the tests since they won't work on a multi-architecture build cp Makefile Makefile.orig sed -e "/^all:/s/ test//" Makefile.orig > Makefile + # No configure script, we must used CC, AR and RANLIB set by cook. case "$ARCH" in - arm) + arm*) make -f Makefile-libbz2_so CC=${CC} AR=${AR} RANLIB=${RANLIB} && make clean && make CC=${CC} AR=${AR} RANLIB=${RANLIB} ;; *) diff -r 9aa78458e396 -r 906854cfa70d glibc-base/receipt --- a/glibc-base/receipt Sat Apr 26 08:05:20 2014 +0000 +++ b/glibc-base/receipt Sat Apr 26 11:02:15 2014 +0200 @@ -15,12 +15,12 @@ # Handle multiarch compilation. case "$ARCH" in - arm|x86_64) VERSION="2.13" WANTED="" ;; + arm*|x86_64) VERSION="2.13" WANTED="" ;; esac # Handle multiarch installation. case "$SLITAZ_ARCH" in - arm|x86_64) VERSION="2.13" WANTED="" ;; + arm*|x86_64) VERSION="2.13" WANTED="" ;; esac # Rules to gen a SliTaz package suitable for Tazpkg. @@ -49,7 +49,7 @@ done case "$ARCH" in - arm) + arm*) # Eglibc is cross compiled by cross to have a toolchain so we can # use these files instead of recooking it. ARM use Eglibc echo "Using cross compiled Eglibc..."