r4933 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2011-09-04 08:07:26 +0000 (Sun, 04 Sep 2011)
New Revision: 4933
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
Fix ld.so location used inside ldd on kfreebsd-amd64
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-09-03 06:08:17 UTC (rev 4932)
+++ glibc-package/trunk/debian/changelog 2011-09-04 08:07:26 UTC (rev 4933)
@@ -20,6 +20,10 @@
* Add patches/hurd-i386/submitted-libc_stack_end.diff to fix ruby1.9.1 stack
detection.
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 3696 (from glibc-bsd).
+ Fixes ld.so location used inside ldd on kfreebsd-amd64. Closes #640156.
+
-- Aurelien Jarno <aurel32@debian.org> Wed, 24 Aug 2011 12:34:56 +0200
eglibc (2.13-18) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-09-03 06:08:17 UTC (rev 4932)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-09-04 08:07:26 UTC (rev 4933)
@@ -27769,7 +27769,7 @@
@@ -0,0 +1,3 @@
+/LD_TRACE_LOADED_OBJECTS=1/a\
+add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
-+s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-kfreebsd-x86-64\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4\5\6"_
++s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-kfreebsd-x86-64\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \2\4\5\6"_
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/linuxthreads/Makefile
@@ -0,0 +1,4 @@
Reply to: