r3814 - in glibc-package/branches/multiarch/debian: . patches/any
Author: aurel32
Date: 2009-09-08 06:24:56 +0000 (Tue, 08 Sep 2009)
New Revision: 3814
Modified:
glibc-package/branches/multiarch/debian/changelog
glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff
Log:
* patches/any/local-ld-multiarch.diff: add the multiarch compat dir
instead of the multiarch dir.
Modified: glibc-package/branches/multiarch/debian/changelog
===================================================================
--- glibc-package/branches/multiarch/debian/changelog 2009-09-07 21:10:38 UTC (rev 3813)
+++ glibc-package/branches/multiarch/debian/changelog 2009-09-08 06:24:56 UTC (rev 3814)
@@ -3,6 +3,8 @@
* Use the multiarch path for the native version and optimized flavors.
* Simplify the creation of /etc/ld.so.conf.d/<triplet>.conf.
* Install a symlink ABI -> multiarch path.
+ * patches/any/local-ld-multiarch.diff: add the multiarch compat dir
+ instead of the multiarch dir.
-- Aurelien Jarno <aurel32@debian.org> Mon, 07 Sep 2009 23:10:09 +0200
Modified: glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff 2009-09-07 21:10:38 UTC (rev 3813)
+++ glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff 2009-09-08 06:24:56 UTC (rev 3814)
@@ -1,36 +1,17 @@
-2009-08-23 Samuel Thibault <sthibault@debian.org>
+2009-09-08 Aurelien Jarno <aurelien@aurel32.net>
- * Makeconfig: convert back gnu-gnu into gnu.
- Look for gnu-gnu in configure.in for the reason (easier matching).
+ * Makeconfig: add support for multiarch compat directories.
-2009-08-09 Aurelien Jarno <aurelien@aurel32.net>
-
- * Makeconfig: convert i586 and i686 into i486.
-
-2005-01-20 Tollef Fog Heen <tfheen@debian.org>
-
- * Makeconfig: add multiarch support
-
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,21 @@
+@@ -191,6 +191,11 @@
endif
inst_libdir = $(install_root)$(libdir)
-+# Multiarch places to look for libraries
++# Compat places to look for libraries
+ifndef extra_libdir
-+ifneq (,$(findstring $(config-machine),i586 i686))
-+multiarch-machine = i486
-+else
-+multiarch-machine = $(config-machine)
++extra_libdir = /lib:$(exec_prefix)/lib
+endif
-+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
Reply to: