From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Wed, 16 Dec 2020 21:33:25 +0000 (+0000)
Subject: local-ld-multiarch
X-Git-Tag: archive/raspbian/2.31-6+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c547ae39873f20663a5bd478f7e510a95fb1f69e;p=glibc.git

local-ld-multiarch

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.


Gbp-Pq: Topic any
Gbp-Pq: Name local-ld-multiarch.diff
---

diff --git a/Makeconfig b/Makeconfig
index 8e65f463e..73cc45c54 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -136,6 +136,11 @@ libdir = $(exec_prefix)/lib
 endif
 inst_libdir = $(install_root)$(libdir)
 
+# Compat places to look for libraries
+ifndef extra_libdir
+extra_libdir = /lib:$(exec_prefix)/lib
+endif
+
 # Where to install the shared library.
 ifndef slibdir
 slibdir = $(exec_prefix)/lib
@@ -601,6 +606,10 @@ else
 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)
diff --git a/elf/Makefile b/elf/Makefile
index 604134456..fd04bf886 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -568,7 +568,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).