Updated replacement for the second patch attached.

Cheers,
-- 
Steve McIntyre
steve.mcint...@linaro.org
--- klibc-1.5.22/debian/rules	2011-05-18 12:56:12.000000000 +0000
+++ klibc-1.5.22/debian/rules	2011-06-14 16:58:59.000000000 +0000
@@ -4,10 +4,14 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_HOST_ARCH),armel)
 DEB_MAKE_ENVVARS := CONFIG_AEABI=y
 endif
+ifeq ($(DEB_HOST_ARCH),armhf)
+DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8
+endif
 ifeq ($(DEB_HOST_ARCH),ia64)
 DEB_MAKE_ENVVARS := ARCH=ia64
 endif
@@ -43,8 +54,15 @@
 		rm -rf linux/include; \
 		mkdir -p linux/include; \
 		ln -s /usr/include/linux linux/include; \
-		for x in /usr/include/asm*; do \
-			ln -s $${x} linux/include; \
+		INC_PATH="/usr/include/asm*"; \
+		if [ -n "$(DEB_HOST_MULTIARCH)" ]; then \
+			INC_PATH="$${INC_PATH} /usr/include/$(DEB_HOST_MULTIARCH)/asm*"; \
+			INC_PATH="$${INC_PATH} /usr/$(DEB_HOST_MULTIARCH)/include/asm*"; \
+		fi; \
+		for x in $${INC_PATH}; do \
+			if [ -e $${x} ] ; then \
+				ln -sf $${x} linux/include; \
+			fi; \
 		done \
 	fi
 	make all $(DEB_MAKE_ENVVARS)

Reply via email to