# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1398480637 -7200
# Node ID d2fcb67eec695b9b5ba841d05a3a1d18e03813aa
# Parent  5c75485e8406ad9d6197ba33dce5dc6cbc684036
Make it cross compile for armv6hf

diff -r 5c75485e8406 -r d2fcb67eec69 cook
--- a/cook	Fri Apr 25 14:14:16 2014 +0200
+++ b/cook	Sat Apr 26 04:50:37 2014 +0200
@@ -493,7 +493,7 @@
 
 	# Handle cross-tools.
 	case "$ARCH" in
-		arm|x86_64)
+		arm*|x86_64)
 			# CROSS_COMPILE is used by at least Busybox and the kernel to set
 			# the cross-tools prefix. Sysroot is the root of our target arch
 			sysroot=$CROSS_TREE/sysroot
@@ -1474,7 +1474,8 @@
 		# Some packages are not included in some arch or fail to cross compile.
 		: ${HOST_ARCH=i486}
 		debug "Host arch $HOST_ARCH"
-		if ! $(echo "$HOST_ARCH" | egrep -q "$ARCH|any"); then
+		# Handle arm{v6hf,v7,..}
+		if ! $(echo "$HOST_ARCH" | egrep -q "${ARCH%v[0-9]*}|any"); then
 			_ "cook: HOST_ARCH=\$HOST_ARCH"
 			_ "cook: \$pkg doesn't cook or is not included in: \$ARCH"
 			[ "$CROSS_BUGS" ] && _ "bugs: \$CROSS_BUGS"
diff -r 5c75485e8406 -r d2fcb67eec69 cross
--- a/cross	Fri Apr 25 14:14:16 2014 +0200
+++ b/cross	Sat Apr 26 04:50:37 2014 +0200
@@ -492,7 +492,7 @@
 		# cross compilation fail. Some receipt may got hack to force
 		# use of libs in sysroot but 'cross libhack' should be prefered.
 		echo "Libdir: $sysroot/usr/lib" 
-		for la in $(fgrep -l libdir= $sysroot/usr/lib/*.la)
+		for la in $(fgrep -l libdir= $sysroot/usr/lib/*.la 2>/dev/null)
 		do
 			if fgrep -q "libdir='/usr/lib'" ${la}; then
 				echo "Cross fixing: $(basename $la)"