tags 645738 + patch tags 645738 + pending thanks Hi maks,
I've prepared an NMU for klibc (versioned as 1.5.25-1.1) and will upload it in a moment. This is needed to unblock work on d-i for wheezy. Cheers, Julien
diff -Nru klibc-1.5.25/debian/changelog klibc-1.5.25/debian/changelog
--- klibc-1.5.25/debian/changelog 2011-08-23 18:11:58.000000000 +0200
+++ klibc-1.5.25/debian/changelog 2011-12-30 17:05:06.000000000 +0100
@@ -1,3 +1,11 @@
+klibc (1.5.25-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix build to work with multiarched linux-libc-dev (using patch from
+ Ubuntu), closes: #645738.
+
+ -- Julien Cristau <jcris...@debian.org> Fri, 30 Dec 2011 17:04:30 +0100
+
klibc (1.5.25-1) unstable; urgency=low
* New upstream release (scandir, capset, capget, kinit drop_capabilities)
diff -Nru klibc-1.5.25/debian/patches/klibc-linux-libc-dev klibc-1.5.25/debian/patches/klibc-linux-libc-dev
--- klibc-1.5.25/debian/patches/klibc-linux-libc-dev 2011-08-23 18:13:03.000000000 +0200
+++ klibc-1.5.25/debian/patches/klibc-linux-libc-dev 2011-12-30 17:00:40.000000000 +0100
@@ -22,15 +22,18 @@
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
Signed-off-by: maximilian attems <m...@stro.at>
-diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
-index de918f0..608759d 100644
---- a/scripts/Kbuild.install
-+++ b/scripts/Kbuild.install
-@@ -95,8 +95,11 @@ header:
+Index: klibc-1.5.25/scripts/Kbuild.install
+===================================================================
+--- klibc-1.5.25.orig/scripts/Kbuild.install
++++ klibc-1.5.25/scripts/Kbuild.install
+@@ -95,8 +95,14 @@ header:
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
++ $(Q)if [ -n "$(DEB_HOST_MULTIARCH)" ]; then \
++ ln -s /usr/include/$(DEB_HOST_MULTIARCH)/asm $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
++ fi
+ $(Q)for x in /usr/include/linux /usr/include/asm*; do \
+ ln -s $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
+ done
diff -Nru klibc-1.5.25/debian/rules klibc-1.5.25/debian/rules
--- klibc-1.5.25/debian/rules 2011-08-23 18:11:48.000000000 +0200
+++ klibc-1.5.25/debian/rules 2011-12-30 17:01:07.000000000 +0100
@@ -4,7 +4,7 @@
#export DH_VERBOSE=1
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH),armel)
DEB_MAKE_ENVVARS := CONFIG_AEABI=y
signature.asc
Description: Digital signature
