Hi guys, Please find attached a patch that rounds out eglibc's support for multiarch building. I believe (but have not directly tested in Debian) that everything in this patch is safe to apply to eglibc currently without introducing regressions. I then have one further set of changes which I'm still in the process of cleaning up for submission, which will turn on the multiarch build; that patchset is dependent on <http://lists.debian.org/debian-dpkg/2011/03/msg00051.html>, so we're not ready for this to be applied to the eglibc in Debian just yet. I hope this dpkg-dev support will be added in the upcoming 1.16.0 dpkg release. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slangasek@ubuntu.com vorlon@debian.org
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: steve.langasek@linaro.org-20110309180940-\
# 54o4derj9451j33w
# target_branch: svn://svn.debian.org/pkg-glibc/glibc-\
# package/branches/eglibc-2.13/
# testament_sha1: 4832d21eb0c809e47bb458b08e5ce88914481471
# timestamp: 2011-03-09 10:15:55 -0800
# base_revision_id: svn-v4:6ef976f9-4de5-0310-a40d-91cae572ec18:glibc-\
# package/branches/eglibc-2.13:4569
#
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-03 11:56:32 +0000
+++ debian/changelog 2011-03-09 18:09:40 +0000
@@ -1,3 +1,15 @@
+eglibc (2.13-0exp4) UNRELEASED; urgency=low
+
+ * Set Multi-Arch: foreign on the appropriate packages.
+ * debian/rules.d/debhelper.mk: set $rtlddir in the debhelper substitution
+ rules, so we don't substitute an empty string.
+ * debian/debhelper.in/libc.install,
+ debian/debhelper.in/libc.lintian-overrides: ld is always installed
+ relative to RTLDDIR, not SLIBDIR; a no-op for the moment, but relevant
+ once we start building for multiarch.
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 09 Mar 2011 10:07:19 -0800
+
eglibc (2.13-0exp3) experimental; urgency=low
[ Aurelien Jarno ]
=== modified file 'debian/control.in/main'
--- debian/control.in/main 2011-02-26 20:28:09 +0000
+++ debian/control.in/main 2011-03-09 18:07:41 +0000
@@ -20,6 +20,7 @@
Architecture: any
Section: libs
Priority: required
+Multi-Arch: foreign
Depends: ${misc:Depends}
Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10)
Replaces: libc0.1, libc0.3, libc6, libc6.1
@@ -39,6 +40,7 @@
Architecture: any
Section: libdevel
Priority: optional
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: manpages-dev
Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev
@@ -89,6 +91,7 @@
Architecture: any
Section: localization
Priority: extra
+Multi-Arch: foreign
Depends: ${locale:Depends}, ${misc:Depends}, lzma
Provides: locales
Description: Embedded GNU C Library: Precompiled locale data
@@ -100,6 +103,7 @@
Package: nscd
Architecture: any
Section: admin
+Multi-Arch: foreign
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Embedded GNU C Library: Name Service Cache Daemon
=== modified file 'debian/debhelper.in/libc.install'
--- debian/debhelper.in/libc.install 2009-11-10 19:25:19 +0000
+++ debian/debhelper.in/libc.install 2011-03-09 18:09:40 +0000
@@ -1,3 +1,4 @@
+TMPDIR/RTLDDIR/*.so* RTLDDIR
TMPDIR/SLIBDIR/*.so* SLIBDIR
TMPDIR/LIBDIR/gconv/* LIBDIR/gconv
=== modified file 'debian/debhelper.in/libc.lintian-overrides'
--- debian/debhelper.in/libc.lintian-overrides 2010-05-28 21:51:08 +0000
+++ debian/debhelper.in/libc.lintian-overrides 2011-03-09 18:09:40 +0000
@@ -3,11 +3,11 @@
LIBC: unstripped-binary-or-object .SLIBDIR/libpthread-2.11.1.so
# ld.so must be executable, otherwise the system will not work
-LIBC: shlib-with-executable-bit SLIBDIR/ld-2.11.1.so 0755
+LIBC: shlib-with-executable-bit RTLDDIR/ld-2.11.1.so 0755
# It is normal that the ELF dynamic linker does not need any other
# library
-LIBC: shared-lib-without-dependency-information .SLIBDIR/ld-2.11.1.so
+LIBC: shared-lib-without-dependency-information .RTLDDIR/ld-2.11.1.so
# dependency on debconf is not needed, as glibc has a fallback to tty
LIBC: missing-debconf-dependency-for-preinst
=== modified file 'debian/rules.d/debhelper.mk'
--- debian/rules.d/debhelper.mk 2011-02-26 20:28:09 +0000
+++ debian/rules.d/debhelper.mk 2011-03-09 18:08:34 +0000
@@ -182,6 +182,7 @@
$(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_%
libdir=$(call xx,libdir) ; \
slibdir=$(call xx,slibdir) ; \
+ rtlddir=$(call xx,rtlddir) ; \
curpass=$(curpass) ; \
c_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libc\.so\."` ; \
m_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libm\.so\."` ; \
# Begin bundle
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
huBl2IB8gZageAOD/4u5IpwoSA3OUNGA
Attachment:
signature.asc
Description: Digital signature