diff -ur klibc-1.5.20.orig/debian/changelog klibc-1.5.20/debian/changelog --- klibc-1.5.20.orig/debian/changelog 2011-03-16 22:00:26.000000000 +0000 +++ klibc-1.5.20/debian/changelog 2011-04-06 14:13:50.000000000 +0100 @@ -1,3 +1,9 @@ +klibc (1.5.20-1ubuntu5) maverick; urgency=low + + * Fix build to work with multiarched linux-libc-dev + + -- Wookey Wed, 06 Apr 2011 14:12:58 +0100 + klibc (1.5.20-1ubuntu4) natty; urgency=low * New patch, arm-size-directives, fixes generation of .size directive for diff -ur klibc-1.5.20.orig/debian/rules klibc-1.5.20/debian/rules --- klibc-1.5.20.orig/debian/rules 2011-02-20 06:50:09.000000000 +0000 +++ klibc-1.5.20/debian/rules 2011-04-06 14:12:46.000000000 +0100 @@ -4,6 +4,7 @@ #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 @@ -43,6 +44,7 @@ rm -rf linux/include; \ mkdir -p linux/include; \ ln -s /usr/include/linux linux/include; \ + ln -s /usr/include/$(DEB_HOST_MULTIARCH)/asm linux/include; \ for x in /usr/include/asm*; do \ ln -s $${x} linux/include; \ done \