Bug#634850: [patch] provide the multiarch libdir for the non-default multilibs
Package: eglibc
Version: 2.13-10
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
this is for a pending change for the multiarch updates in GCC. On multilib
enabled archs the include and library directories are looked up using a prefix
and a relative path. With the pending upload, lookups will fail for the
non-default multilibs, e.g. on amd64 /usr/lib/i386-linux-gnu/../../lib32 doesn't
work as long as the /usr/lib/i386-linux-gnu directory is non-existant (needed to
access the crti.o et al. files). the eglibc biarch -dev packages should ship
this empty directory. The attached patch needs updating for mips, mipsel and
kfreebsd-amd64.
* Add an empty directory /usr/lib/<multiarch> in the biarch -dev packages,
needed by GCC to resolve names relative to this path.
=== modified file 'debian/sysdeps/amd64.mk'
--- debian/sysdeps/amd64.mk 2011-06-02 18:13:24 +0000
+++ debian/sysdeps/amd64.mk 2011-07-20 13:09:58 +0000
@@ -47,6 +47,7 @@
cp -af debian/tmp-i386/usr/include/i486-linux-gnu/sys/vm86.h \
debian/libc6-dev-i386/usr/include/sys
mkdir -p debian/libc6-dev-i386/usr/include/i486-linux-gnu
+mkdir -p debian/libc6-dev-i386/usr/lib/i386-linux-gnu
endef
define libc6-i386_extra_pkg_install
=== modified file 'debian/sysdeps/i386.mk'
--- debian/sysdeps/i386.mk 2011-03-09 01:00:53 +0000
+++ debian/sysdeps/i386.mk 2011-07-20 13:10:55 +0000
@@ -58,5 +58,6 @@
cp -af debian/tmp-amd64/usr/include/gnu/stubs-64.h \
debian/libc6-dev-amd64/usr/include/gnu
mkdir -p debian/libc6-dev-amd64/usr/include/x86_64-linux-gnu
+mkdir -p debian/libc6-dev-amd64/usr/lib/x86_64-linux-gnu
endef
=== modified file 'debian/sysdeps/powerpc.mk'
--- debian/sysdeps/powerpc.mk 2011-03-09 01:00:53 +0000
+++ debian/sysdeps/powerpc.mk 2011-07-20 13:12:54 +0000
@@ -19,5 +19,6 @@
cp -af debian/tmp-ppc64/usr/include/powerpc64-linux-gnu/gnu/stubs-64.h \
debian/libc6-dev-ppc64/usr/include/gnu
mkdir -p debian/libc6-dev-ppc64/usr/include/powerpc64-linux-gnu
+mkdir -p debian/libc6-dev-ppc64/usr/lib/powerpc64-linux-gnu
endef
=== modified file 'debian/sysdeps/ppc64.mk'
--- debian/sysdeps/ppc64.mk 2011-03-09 01:00:53 +0000
+++ debian/sysdeps/ppc64.mk 2011-07-20 13:13:28 +0000
@@ -27,6 +27,7 @@
cp -af debian/tmp-powerpc/usr/include/powerpc-linux-gnu/gnu/stubs-32.h \
debian/libc6-dev-powerpc/usr/include/gnu
mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc-linux-gnu
+mkdir -p debian/libc6-dev-powerpc/usr/lib/powerpc-linux-gnu
endef
# create a symlink for the 32 bit dynamic linker in /lib
=== modified file 'debian/sysdeps/s390.mk'
--- debian/sysdeps/s390.mk 2011-03-09 01:00:53 +0000
+++ debian/sysdeps/s390.mk 2011-07-20 13:15:18 +0000
@@ -17,6 +17,7 @@
cp -af debian/tmp-s390x/usr/include/s390x-linux-gnu/gnu/stubs-64.h \
debian/libc6-dev-s390x/usr/include/gnu
mkdir -p debian/libc6-dev-s390x/usr/include/s390x-linux-gnu
+mkdir -p debian/libc6-dev-s390x/usr/lib/s390x-linux-gnu
endef
define libc6-s390x_extra_pkg_install
=== modified file 'debian/sysdeps/sparc.mk'
--- debian/sysdeps/sparc.mk 2011-06-23 18:13:13 +0000
+++ debian/sysdeps/sparc.mk 2011-07-20 13:14:27 +0000
@@ -19,6 +19,7 @@
cp -af debian/tmp-sparc64/usr/include/sparc64-linux-gnu/gnu/stubs-64.h \
debian/libc6-dev-sparc64/usr/include/gnu
mkdir -p debian/libc6-dev-sparc64/usr/include/sparc64-linux-gnu
+mkdir -p debian/libc6-dev-sparc64/usr/lib/sparc64-linux-gnu
endef
EGLIBC_PASSES += sparc64b
Reply to: