Author: aurel32 Date: 2006-02-23 09:59:27 +0000 (Thu, 23 Feb 2006) New Revision: 1218
Added: glibc-package/trunk/debian/patches/ld-multiarch.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: * Multiarch support: - Add ld-multiarch.diff (Add (/usr)/lib/$(config-machine)-$(config-os)) to the search path of the dynamic linker) from Tollef Fog Heen. (Closes: #295855) Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2006-02-23 09:55:31 UTC (rev 1217) +++ glibc-package/trunk/debian/changelog 2006-02-23 09:59:27 UTC (rev 1218) @@ -90,6 +90,10 @@ gcc-3.4. * Remove --with-tls and --with-__thread in sysdeps/* as they are the default option since version 2.3.5. + * Multiarch support: + - Add ld-multiarch.diff (Add (/usr)/lib/$(config-machine)-$(config-os)) + to the search path of the dynamic linker) from Tollef Fog Heen. + (Closes: #295855) -- Clint Adams <[EMAIL PROTECTED]> Sun, 12 Feb 2006 11:04:38 -0500 Added: glibc-package/trunk/debian/patches/ld-multiarch.diff =================================================================== --- glibc-package/trunk/debian/patches/ld-multiarch.diff 2006-02-23 09:55:31 UTC (rev 1217) +++ glibc-package/trunk/debian/patches/ld-multiarch.diff 2006-02-23 09:59:27 UTC (rev 1218) @@ -0,0 +1,29 @@ +2005-01-20 Tollef Fog Heen <[EMAIL PROTECTED]> + + * Makeconfig: add multiarch support + +--- glibc-2.3.6/Makeconfig 2006-02-22 12:44:52.424091146 +0100 ++++ glibc-2.3.6/Makeconfig 2006-02-22 12:45:52.161604171 +0100 +@@ -176,6 +176,11 @@ + endif + inst_libdir = $(install_root)$(libdir) + ++# Extra places to look for libraries ++ifndef extra_libdir ++extra_libdir = /lib/$(config-machine)-$(config-os):$(exec_prefix)/lib/$(config-machine)-$(config-os) ++endif ++ + # Where to install the shared library and dynamic linker. + ifndef slibdir + slibdir = $(exec_prefix)/lib +@@ -479,6 +484,10 @@ + default-rpath = $(libdir) + endif + ++ifdef extra_libdir ++default-rpath += :$(extra_libdir) ++endif ++ + ifndef link-extra-libs + link-extra-libs = $(LDLIBS-$(@F)) + link-extra-libs-static = $(link-extra-libs) Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2006-02-23 09:55:31 UTC (rev 1217) +++ glibc-package/trunk/debian/patches/series 2006-02-23 09:59:27 UTC (rev 1218) @@ -126,3 +126,4 @@ glibc-manual-memory.diff -p1 hurd-ioctl-decode-argument.diff -p0 glibc-manual-string.diff -p1 +ld-multiarch.diff -p1 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]