From owner-svn-src-head@freebsd.org Tue Nov 12 22:32:01 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D5A81BD4C4; Tue, 12 Nov 2019 22:32:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47CMtS72sMz4CSZ; Tue, 12 Nov 2019 22:32:00 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D51A469F5; Tue, 12 Nov 2019 22:32:00 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xACMW0fZ046773; Tue, 12 Nov 2019 22:32:00 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xACMW0OO046771; Tue, 12 Nov 2019 22:32:00 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201911122232.xACMW0OO046771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Tue, 12 Nov 2019 22:32:00 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head: libexec/rtld-elf libexec/rtld-elf32 usr.bin/ldd32 X-SVN-Commit-Revision: 354663 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2019 22:32:01 -0000 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"