Author: aurel32
Date: 2006-02-23 10:07:58 +0000 (Thu, 23 Feb 2006)
New Revision: 1220
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-alt.install
glibc-package/trunk/debian/debhelper.in/libc.install
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Multiarch support:
- Create (/usr)/lib/$(config-machine)-$(config-os) and add symlinks to
these directories in /lib/ldconfig/
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-23 10:04:15 UTC (rev
1219)
+++ glibc-package/trunk/debian/changelog 2006-02-23 10:07:58 UTC (rev
1220)
@@ -96,6 +96,8 @@
(Closes: #295855)
- Add ldconfig-multiarch.diff (add directories pointed from /lib/ldconfig
to the search path).
+ - Create (/usr)/lib/$(config-machine)-$(config-os) and add symlinks to
+ these directories in /lib/ldconfig/
-- Clint Adams <[EMAIL PROTECTED]> Sun, 12 Feb 2006 11:04:38 -0500
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-02-23
10:04:15 UTC (rev 1219)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-02-23
10:07:58 UTC (rev 1220)
@@ -1,3 +1,6 @@
# This file is used for 64-bit libraries.
TMPDIR/lib*/*.so* libDESTLIBDIR
TMPDIR/usr/lib*/gconv/*.so* usr/libDESTLIBDIR/gconv
+TMPDIR/lib/ldconfig/
+TMPDIR/lib/*-*-gnu/ lib
+TMPDIR/usr/lib/*-*-gnu/ usr/lib
Modified: glibc-package/trunk/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.install 2006-02-23
10:04:15 UTC (rev 1219)
+++ glibc-package/trunk/debian/debhelper.in/libc.install 2006-02-23
10:07:58 UTC (rev 1220)
@@ -21,3 +21,7 @@
debian/tmp-libc/usr/lib/pt_chown usr/lib
debian/local/usr_sbin/tzconfig usr/sbin
+
+debian/tmp-libc/lib/ldconfig/
+debian/tmp-libc/lib/*-*-gnu/ lib
+debian/tmp-libc/usr/lib/*-*-gnu/ usr/lib
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-02-23 10:04:15 UTC (rev
1219)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-02-23 10:07:58 UTC (rev
1220)
@@ -122,5 +122,13 @@
ln -sf /lib/tls/librt.so.1 debian/tmp-libc/usr/lib/nptl/; \
fi
+ # Create the multidir directories, and the symlinks in /lib/ldconfig
+ mkdir -p debian/tmp-$(curpass)/lib/ldconfig; \
+ machine=`sed '/^ *config-machine *=/!d;s/.*= *//g'
$(DEB_BUILDDIR)/config.make`; \
+ os=`sed '/^ *config-os *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
+ mkdir -p debian/tmp-$(curpass)/lib/$$machine-$$os
debian/tmp-$(curpass)/usr/lib/$$machine-$$os; \
+ ln -s /lib/$$machine-$$os
debian/tmp-$(curpass)/lib/ldconfig/$$machine-$$os-lib; \
+ ln -s /usr/lib/$$machine-$$os
debian/tmp-$(curpass)/lib/ldconfig/$$machine-$$os-usr-lib
+
$(call xx,extra_install)
touch $@
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
