r3747 - in glibc-package/trunk/debian: . patches/any
Author: aurel32
Date: 2009-08-09 19:36:42 +0000 (Sun, 09 Aug 2009)
New Revision: 3747
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff
Log:
* patches/any/local-ld-multiarch.diff: convert i586 and i686 into i486
(Closes: bug#540646).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-08-09 19:15:04 UTC (rev 3746)
+++ glibc-package/trunk/debian/changelog 2009-08-09 19:36:42 UTC (rev 3747)
@@ -7,6 +7,8 @@
* Recommends libc6-i686 on amd64 and libc0.1-i686 on kfreebsd-amd64
(Closes: bug#455603).
* Don't access dpkg files directly in libc6.preinst.
+ * patches/any/local-ld-multiarch.diff: convert i586 and i686 into i486
+ (Closes: bug#540646).
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2696 (from glibc-bsd).
Modified: glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff 2009-08-09 19:15:04 UTC (rev 3746)
+++ glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff 2009-08-09 19:36:42 UTC (rev 3747)
@@ -1,3 +1,7 @@
+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
@@ -2,15 +6,13 @@
----
- Makeconfig | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,11 @@
+@@ -191,6 +191,13 @@
endif
inst_libdir = $(install_root)$(libdir)
-+# Extra places to look for libraries
++# Multiarch places to look for libraries
+ifndef extra_libdir
-+extra_libdir = /lib/$(config-machine)-$(config-os):$(exec_prefix)/lib/$(config-machine)-$(config-os)
++multiarch-machine = $(subst i586,i486,$(config-machine))
++multiarch-machine = $(subst i686,i486,$(multiarch-machine))
++extra_libdir = /lib/$(multiarch-machine)-$(config-os):$(exec_prefix)/lib/$(multiarch-machine)-$(config-os)
+endif
@@ -20,7 +22,7 @@
# Where to install the shared library and dynamic linker.
ifndef slibdir
slibdir = $(exec_prefix)/lib
-@@ -501,6 +506,10 @@
+@@ -501,6 +508,10 @@
default-rpath = $(libdir)
endif
Reply to: