r3751 - glibc-package/trunk/debian/patches/any
Author: aurel32
Date: 2009-08-10 11:39:13 +0000 (Mon, 10 Aug 2009)
New Revision: 3751
Modified:
glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff
Log:
Fix any/local-ld-multiarch.diff
Modified: glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff 2009-08-09 20:10:57 UTC (rev 3750)
+++ glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff 2009-08-10 11:39:13 UTC (rev 3751)
@@ -8,21 +8,24 @@
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,13 @@
+@@ -191,6 +191,16 @@
endif
inst_libdir = $(install_root)$(libdir)
+# Multiarch places to look for libraries
+ifndef extra_libdir
-+multiarch-machine = $(subst i586,i486,$(config-machine))
-+multiarch-machine = $(subst i686,i486,$(multiarch-machine))
++ifneq (,$(findstring $(config-machine),i586 i686))
++multiarch-machine = i486
++else
++multiarch-machine = $(config-machine)
++endif
+extra_libdir = /lib/$(multiarch-machine)-$(config-os):$(exec_prefix)/lib/$(multiarch-machine)-$(config-os)
+endif
+
# Where to install the shared library and dynamic linker.
ifndef slibdir
slibdir = $(exec_prefix)/lib
-@@ -501,6 +508,10 @@
+@@ -501,6 +511,10 @@
default-rpath = $(libdir)
endif
Reply to: