Author: aurel32
Date: 2011-05-24 14:24:12 +0000 (Tue, 24 May 2011)
New Revision: 4679
Modified:
glibc-package/trunk/debian/debhelper.in/libc-alt.install
glibc-package/trunk/debian/rules.d/build.mk
Log:
Always install a biarch-compat.conf file for biarch packages
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.install 2011-05-24
14:23:52 UTC (rev 4678)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.install 2011-05-24
14:24:12 UTC (rev 4679)
@@ -2,4 +2,6 @@
TMPDIR/SLIBDIR/*.so* SLIBDIR
TMPDIR/LIBDIR/gconv/* LIBDIR/gconv/
+TMPDIR/etc/ld.so.conf.d /etc
+
BUILD-TREE/test-results-*-FLAVOR usr/share/doc/LIBC-FLAVOR
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2011-05-24 14:23:52 UTC (rev
4678)
+++ glibc-package/trunk/debian/rules.d/build.mk 2011-05-24 14:24:12 UTC (rev
4679)
@@ -166,12 +166,9 @@
# the multiarch ld.so doesn't look at the (non-standard) /lib32, so we
# need path compatibility when biarch and multiarch packages are both
# installed.
- # We don't want this for lib64 because lib64 *is* standard on amd64
- # and powerpc64 so the multiarch package should support it
- # intrinsically.
- case $(curpass) in i386|powerpc) \
+ case $(call xx,slibdir) in /lib32 | /lib64) \
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
- conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/biarch-compat.conf";
\
+
conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$(curpass)-biarch-compat.conf";
\
echo "# Legacy biarch compatibility support" > $$conffile; \
echo "$(call xx,slibdir)" >> $$conffile; \
echo "$(call xx,libdir)" >> $$conffile; \
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qoswq-00073h...@vasks.debian.org
