r5237 - in glibc-package/trunk/debian: . patches/any
Author: aurel32
Date: 2012-05-01 11:26:50 +0000 (Tue, 01 May 2012)
New Revision: 5237
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff
Log:
* patches/any/local-ld-multiarch.diff: update to correctly compute
$ORIGIN with two level slibdir directories. Closes: #632281.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-05-01 10:42:55 UTC (rev 5236)
+++ glibc-package/trunk/debian/changelog 2012-05-01 11:26:50 UTC (rev 5237)
@@ -3,6 +3,8 @@
* Fix kfreebsd symbols files. Closes: #667687.
* local/manpages/ld.so.8: fixes after previous rework. Closes:
#670883.
+ * patches/any/local-ld-multiarch.diff: update to correctly compute
+ $ORIGIN with two level slibdir directories. Closes: #632281.
-- Aurelien Jarno <aurel32@debian.org> Sun, 29 Apr 2012 19:03:35 +0200
Modified: glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff 2012-05-01 10:42:55 UTC (rev 5236)
+++ glibc-package/trunk/debian/patches/any/local-ld-multiarch.diff 2012-05-01 11:26:50 UTC (rev 5237)
@@ -1,3 +1,8 @@
+2012-05-01 Aurelien Jarno <aurelien@aurel32.net>
+
+ * elf/Makefile(trusted-dirs.st): Fix DL_DST_LIB computation with
+ two level slibdir directories.
+
2009-09-08 Aurelien Jarno <aurelien@aurel32.net>
* Makeconfig: add support for multiarch compat directories.
@@ -3,6 +8,7 @@
---
- Makeconfig | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
+ Makeconfig | 9 +++++++++
+ elf/Makefile | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
--- a/Makeconfig
@@ -31,3 +37,15 @@
ifndef link-extra-libs
link-extra-libs = $(LDLIBS-$(@F))
link-extra-libs-static = $(link-extra-libs)
+
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -360,7 +360,7 @@ $(objpfx)trusted-dirs.st: Makefile $(..)Makeconfig
+ $(make-target-directory)
+ echo "$(subst :, ,$(default-rpath) $(user-defined-trusted-dirs))" \
+ | $(AWK) -f gen-trusted-dirs.awk > ${@:st=T};
+- echo '#define DL_DST_LIB "$(notdir $(slibdir))"' >> ${@:st=T}
++ echo '#define DL_DST_LIB "$(shell echo $(slibdir) | sed 's,/,,')"' >> ${@:st=T}
+ $(move-if-change) ${@:st=T} ${@:st=h}
+ touch $@
+ CPPFLAGS-dl-load.c = -I$(objpfx). -I$(csu-objpfx).
Reply to: