From fe5d285d1fcebbd6fd4bb20352b8d184e1d19323 Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Sun, 19 Sep 2021 19:46:59 +0100 Subject: [PATCH] local-ld-multiarch 2012-05-01 Aurelien Jarno * elf/Makefile(trusted-dirs.st): Fix DL_DST_LIB computation with two level slibdir directories. 2009-09-08 Aurelien Jarno * Makeconfig: add support for multiarch compat directories. Gbp-Pq: Topic any Gbp-Pq: Name local-ld-multiarch.diff --- Makeconfig | 9 +++++++++ elf/Makefile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makeconfig b/Makeconfig index 8074613b8..1cc4bf34f 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 58a22a64f..8c58aebc0 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -595,7 +595,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). -- 2.30.2