[Multiarch-devel] commit r17868: linux-libc-dev: Multi-arch support

[Aurelien Jarno]

Hi,

Commit r17868 moved the headers into a multiarch directory, but this
patch seems wrong in two aspect:
- It moves the headers to the cross-compile directory, ie
  /usr/$(triplet)/include instead of the multiarch directory, ie
  /usr/include/$(triplet)
- It uses DEB_HOST_GNU_TYPE to find the triplet, which is wrong on some
  architectures. For example on i386, the multiarch triplet is
  i386-linux-gnu instead of i486-linux-gnu.

Please find a patch below to fix theses issue. Note that I have some
issues building certain biarch packages with this patch, that said
Ubuntu is using that for some times, and they don't seems to have any
problem, so it might be a local issue.

Cheers,
Aurelien


Index: rules.real
===================================================================
--- rules.real	(révision 17885)
+++ rules.real	(copie de travail)
@@ -8,6 +8,7 @@
 SHELL  := bash -e
 DEB_HOST_ARCH     := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH:= $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
 UPLOADER  := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
 
@@ -310,8 +311,8 @@
 	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
 
 	# Move include/asm to arch-specific directory
-	mkdir -p $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include
-	mv $(OUT_DIR)/include/asm $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include/
+	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
+	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
 	
 	+$(MAKE_SELF) install-base
 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien at aurel32.net                 http://www.aurel32.net