r1247 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2006-02-27 12:40:37 +0000 (Mon, 27 Feb 2006)
New Revision: 1247
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Only create the multiarch directories and the symlinks in /lib/ldconfig
for the main pass. Otherwise alternate libraries would conflict with the
main one when using multiarch.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-27 12:33:56 UTC (rev 1246)
+++ glibc-package/trunk/debian/changelog 2006-02-27 12:40:37 UTC (rev 1247)
@@ -8,6 +8,9 @@
flavours of the libc. Put them directly in the final directory, and
remove the corresponding tweaks done after the make install phase.
* Install the 32-bit libraries in /emul/ia32-linux(/usr)/lib on amd64.
+ * Only create the multiarch directories and the symlinks in /lib/ldconfig
+ for the main pass. Otherwise alternate libraries would conflict with the
+ main one when using multiarch.
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-02-27 12:33:56 UTC (rev 1246)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-02-27 12:40:37 UTC (rev 1247)
@@ -125,12 +125,14 @@
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
-
+ if [ $(curpass) = libc ]; then \
+ 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
+ fi
+
$(call xx,extra_install)
touch $@
Reply to: