diff -urN newlib-1.18.0/debian/changelog newlib-1.18.0.fixed/debian/changelog --- newlib-1.18.0/debian/changelog 2011-04-07 14:07:32.000000000 +0000 +++ newlib-1.18.0.fixed/debian/changelog 2011-04-07 13:35:37.000000000 +0000 @@ -1,3 +1,9 @@ +newlib (1.18.0-6ubuntu2) maverick; urgency=low + + * Fix build to work with co-installable (multiarched) linux-libc-dev headers + + -- Wookey Thu, 07 Apr 2011 14:34:50 +0100 + newlib (1.18.0-6ubuntu1) natty; urgency=low * Change the way we disable newlib-m68hc1x to be less intrusive. diff -urN newlib-1.18.0/debian/patches/65_multiarch-headers.patch newlib-1.18.0.fixed/debian/patches/65_multiarch-headers.patch --- newlib-1.18.0/debian/patches/65_multiarch-headers.patch 1970-01-01 00:00:00.000000000 +0000 +++ newlib-1.18.0.fixed/debian/patches/65_multiarch-headers.patch 2011-04-07 13:00:49.000000000 +0000 @@ -0,0 +1,26 @@ +Index: newlib-1.18.0/newlib/libc/sys/linux/Makefile.am +=================================================================== +--- newlib-1.18.0.orig/newlib/libc/sys/linux/Makefile.am 2011-04-07 12:39:43.000000000 +0000 ++++ newlib-1.18.0/newlib/libc/sys/linux/Makefile.am 2011-04-07 12:39:47.000000000 +0000 +@@ -169,7 +169,7 @@ + + # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1) + # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux +-SIGNAL_H = /usr/include/asm/signal.h ++SIGNAL_H = /usr/include/$(DEB_HOST_MULTIARCH)/asm/signal.h + + liblinux_la_LDFLAGS = -Xcompiler -nostdlib + +Index: newlib-1.18.0/newlib/libc/sys/linux/Makefile.in +=================================================================== +--- newlib-1.18.0.orig/newlib/libc/sys/linux/Makefile.in 2011-04-07 12:57:39.000000000 +0000 ++++ newlib-1.18.0/newlib/libc/sys/linux/Makefile.in 2011-04-07 12:57:07.000000000 +0000 +@@ -484,7 +484,7 @@ + + # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1) + # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux +-SIGNAL_H = /usr/include/asm/signal.h ++SIGNAL_H = /usr/include/$(DEB_HOST_MULTIARCH)/asm/signal.h + liblinux_la_LDFLAGS = -Xcompiler -nostdlib + ADD_OBJS = \ + $(LINUX_MACH_LIB) diff -urN newlib-1.18.0/debian/patches/series newlib-1.18.0.fixed/debian/patches/series --- newlib-1.18.0/debian/patches/series 2011-04-07 14:07:32.000000000 +0000 +++ newlib-1.18.0.fixed/debian/patches/series 2011-04-07 12:38:23.000000000 +0000 @@ -1,3 +1,4 @@ 60_newlib-libgloss-eabi.patch 61_newlib_arm_include.patch 62_long_double_infinity.patch +65_multiarch-headers.patch diff -urN newlib-1.18.0/debian/rules newlib-1.18.0.fixed/debian/rules --- newlib-1.18.0/debian/rules 2011-04-07 14:07:32.000000000 +0000 +++ newlib-1.18.0.fixed/debian/rules 2011-04-07 14:08:35.000000000 +0000 @@ -3,6 +3,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) version := $(shell dpkg-parsechangelog | grep ^Version | sed -e 's/^Version: //') uversion := $(shell echo $(version) | cut -d '-' -f1)