From nobody Mon Jan 10 10:13:35 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 696C21948988; Mon, 10 Jan 2022 10:13:36 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXV5r0TPtz3mxh; Mon, 10 Jan 2022 10:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E2F44236AC; Mon, 10 Jan 2022 10:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20AADZEd032385; Mon, 10 Jan 2022 10:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AADZPe032384; Mon, 10 Jan 2022 10:13:35 GMT (envelope-from git) Date: Mon, 10 Jan 2022 10:13:35 GMT Message-Id: <202201101013.20AADZPe032384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 68cda3edb675 - releng/13.0 - rtld: Do not install libmap.conf when installing the COMPAT32 version List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: 68cda3edb6758015ff888bd288ce177a7ccec805 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641809616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgktZqV5Dspyynw7WpNNoXQy7KktxiLvn754mO2lIWw=; b=Cw/GHuefuFC3BKR1Bmj968ih5DuSbIGxPvf0fItTUJXfjOZLj8CmVPYBi35XyggT7ZxdT+ JSDGKWOApMFb1HUCUJc9Lhh/G+xor75suk1pVFWKji9X8a6rkwyk+9Y1cQ61JulMH7s2Ag Eruj/B8IPrIfQ5JK6v9TBoLz5zPS/ETc/TFV1WrI+BkcdBMJcIkjBhkHiNFht4D+OjfcUb RSjSFerN88wsSJbIGee8y6gCeVMn9j8vFbdxVfUph+94BHF6SqRlEqNm41IX7881/5qidL gfQV7K6RToI0Ty0V3HHVybQj/kRKlr04Oi0bBgbXu+py9a4JjHBl/3LNNHdYXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641809616; a=rsa-sha256; cv=none; b=OmUVKlTWuFBuOtnTmw+WReKRDLyf3R/jVHJAXAktfM/KvdHTjR4VzCCzsi+Q/YcBUyzLza dNram63pD9glSR8EA9oPlexHZn1Wt1CBZZJaInZYnuaIF7we1HuTWP1EZO9DA0kU3pYZW+ nZMsNgy8DsWRoaTAoedyDhV94Po/iBgxUag9ZGVZ8iQ7yb1fO21UiYpkC5RyA9pWIVUETQ K97+VSr5INfneJDL0xO4m4EyMe2x427CUb7j4hAxOK+f0HnaQjDiH8srXx0C7XCIiRUETg Xb95XeUbwdUYnREygwpgnbqsrP1L3dXHDBSK65xyKxpEDRkPfRz1YQrCrXYnrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.0 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=68cda3edb6758015ff888bd288ce177a7ccec805 commit 68cda3edb6758015ff888bd288ce177a7ccec805 Author: Emmanuel Vadot AuthorDate: 2021-10-13 12:40:26 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-10 08:16:36 +0000 rtld: Do not install libmap.conf when installing the COMPAT32 version This has the effect of installing the same file twice at the same location and confuse pkgbase as we add this file twice in the package config part. Approved by: so (markj@) MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit d0f0e0bd741af867582ceede8ac1b0aec90eae2d) --- libexec/rtld-elf/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 9ae998942a12..b8354e1b6f2d 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -11,7 +11,9 @@ PACKAGE= clibs MK_PIE= no # Always position independent using local rules MK_SSP= no +.if !defined(NEED_COMPAT) CONFS= libmap.conf +.endif PROG?= ld-elf.so.1 .if (${PROG:M*ld-elf32*} != "") TAGS+= lib32