Date: Tue, 12 Nov 2019 22:32:00 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354663 - in head: libexec/rtld-elf libexec/rtld-elf32 usr.bin/ldd32 Message-ID: <201911122232.xACMW0OO046771@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Nov 12 22:31:59 2019 New Revision: 354663 URL: https://svnweb.freebsd.org/changeset/base/354663 Log: libcompat: Correct rtld MLINKS 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 Modified: head/libexec/rtld-elf/Makefile head/libexec/rtld-elf32/Makefile head/usr.bin/ldd32/Makefile Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Tue Nov 12 21:35:05 2019 (r354662) +++ head/libexec/rtld-elf/Makefile Tue Nov 12 22:31:59 2019 (r354663) @@ -49,7 +49,7 @@ INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec 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 .if ${MACHINE_CPUARCH} == "sparc64" Modified: head/libexec/rtld-elf32/Makefile ============================================================================== --- head/libexec/rtld-elf32/Makefile Tue Nov 12 21:35:05 2019 (r354662) +++ head/libexec/rtld-elf32/Makefile Tue Nov 12 22:31:59 2019 (r354663) @@ -5,6 +5,7 @@ NEED_COMPAT= 32 PROG= ld-elf32.so.1 MAN= +MLINKS= rtld.1 ld-elf32.so.1 .PATH: ${SRCTOP}/libexec/rtld-elf .include "${SRCTOP}/libexec/rtld-elf/Makefile" Modified: head/usr.bin/ldd32/Makefile ============================================================================== --- head/usr.bin/ldd32/Makefile Tue Nov 12 21:35:05 2019 (r354662) +++ head/usr.bin/ldd32/Makefile Tue Nov 12 22:31:59 2019 (r354663) @@ -5,6 +5,7 @@ NEED_COMPAT= 32 PROG= ldd32 MAN= +MLINKS= ldd.1 ldd32.1 .PATH: ${SRCTOP}/usr.bin/ldd .include "${SRCTOP}/usr.bin/ldd/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911122232.xACMW0OO046771>