openkylin
/
glibc
mirror of https://gitee.com/openkylin/glibc.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ubuntu Developers 2022-05-13 23:32:10 +08:00 committed by openKylinBot
parent 627f2452b2
commit b36676cef4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makeconfig
View File

@ -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)

2
elf/Makefile
View File

@ -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).