d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcompat: Correct rtld MLINKS

Browse Source 
Don't install duplicate ld-elf.so.1.1 and ld.so.1 links in rtld-elf32.
Do install lib-elf32.so.1.1 and ldd32.1 links.

Reported by:	madpilot
This commit is contained in:
Brooks Davis 2019-11-12 22:31:59 +00:00
parent b662204f54
commit 051ed84f28
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354663
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexec/rtld-elf/Makefile
View File

@ -49,7 +49,7 @@ INSTALLFLAGS= -C -b
PRECIOUSPROG= PRECIOUSPROG=
BINDIR= /libexec BINDIR= /libexec
SYMLINKS= ../..${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG} SYMLINKS= ../..${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG}
MLINKS= rtld.1 ld-elf.so.1.1 \ MLINKS?= rtld.1 ld-elf.so.1.1 \
rtld.1 ld.so.1 rtld.1 ld.so.1
.if ${MACHINE_CPUARCH} == "sparc64" .if ${MACHINE_CPUARCH} == "sparc64"

1
libexec/rtld-elf32/Makefile
View File

@ -5,6 +5,7 @@ NEED_COMPAT= 32
PROG= ld-elf32.so.1 PROG= ld-elf32.so.1
MAN= MAN=
MLINKS= rtld.1 ld-elf32.so.1
.PATH: ${SRCTOP}/libexec/rtld-elf .PATH: ${SRCTOP}/libexec/rtld-elf
.include "${SRCTOP}/libexec/rtld-elf/Makefile" .include "${SRCTOP}/libexec/rtld-elf/Makefile"

1
usr.bin/ldd32/Makefile
View File

@ -5,6 +5,7 @@ NEED_COMPAT= 32
PROG= ldd32 PROG= ldd32
MAN= MAN=
MLINKS= ldd.1 ldd32.1
.PATH: ${SRCTOP}/usr.bin/ldd .PATH: ${SRCTOP}/usr.bin/ldd
.include "${SRCTOP}/usr.bin/ldd/Makefile" .include "${SRCTOP}/usr.bin/ldd/Makefile"