r3779 - in glibc-package/branches/eglibc-2.10/debian: . patches/any rules.d
Author: sthibault
Date: 2009-08-23 16:27:53 +0000 (Sun, 23 Aug 2009)
New Revision: 3779
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff
glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk
Log:
Convert config_os' gnu-gnu into gnu to fix multiarch paths.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-08-23 16:26:37 UTC (rev 3778)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-08-23 16:27:53 UTC (rev 3779)
@@ -122,6 +122,7 @@
* Fix debian/patches/hurd-i386/local-tls-support.diff to align up includes
on Linux, to fix build.
* Apply kfreebsd/local-no-SOCK_NONBLOCK.diff on hurd-i386 to fix build too.
+ * Convert config_os' gnu-gnu into gnu to fix multiarch paths.
-- Aurelien Jarno <aurel32@debian.org> Tue, 18 Aug 2009 21:39:16 +0200
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff 2009-08-23 16:26:37 UTC (rev 3778)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff 2009-08-23 16:27:53 UTC (rev 3779)
@@ -1,3 +1,8 @@
+2009-08-23 Samuel Thibault <sthibault@debian.org>
+
+ * Makeconfig: convert back gnu-gnu into gnu.
+ Look for gnu-gnu in configure.in for the reason (easier matching).
+
2009-08-09 Aurelien Jarno <aurelien@aurel32.net>
* Makeconfig: convert i586 and i686 into i486.
@@ -8,7 +13,7 @@
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,16 @@
+@@ -191,6 +191,21 @@
endif
inst_libdir = $(install_root)$(libdir)
@@ -19,8 +24,13 @@
+else
+multiarch-machine = $(config-machine)
+endif
-+extra_libdir = /lib/$(multiarch-machine)-$(config-os):$(exec_prefix)/lib/$(multiarch-machine)-$(config-os)
++ifeq ($(config-os),gnu-gnu)
++multiarch-os = gnu
++else
++multiarch-os = $(config-os)
+endif
++extra_libdir = /lib/$(multiarch-machine)-$(multiarch-os):$(exec_prefix)/lib/$(multiarch-machine)-$(multiarch-os)
++endif
+
# Where to install the shared library and dynamic linker.
ifndef slibdir
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-08-23 16:26:37 UTC (rev 3778)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-08-23 16:27:53 UTC (rev 3779)
@@ -146,7 +146,7 @@
if [ $(curpass) = libc ]; then \
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
machine=`sed '/^ *config-machine *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
- os=`sed '/^ *config-os *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
+ os=`sed '/^ *config-os *=/!d;s/.*= *//g;s/gnu-gnu/gnu/' $(DEB_BUILDDIR)/config.make`; \
triplet="$$machine-$$os"; \
mkdir -p debian/tmp-$(curpass)/lib/$$triplet debian/tmp-$(curpass)/usr/lib/$$triplet; \
conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$$triplet.conf"; \
Reply to: