From nobody Mon Dec 26 10:03:39 2022 X-Original-To: dev-commits-ports-main@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 4NgYJq2YMkz1HYsd; Mon, 26 Dec 2022 10:03:39 +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 4NgYJq1xFYz3LTB; Mon, 26 Dec 2022 10:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672049019; 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=WITK8bD1Ir6Ylw3kJgRuIAetNZGSWAj0Ac4Gls7YYQA=; b=FVmhhmYJQn9FmmcUP02Z6H+Zc/SLRKIXYMo6LslYiYEkEuEE0pqKnY6KDCXAJRuyOhme3r 6T/NiRQF55G+gdEZqPLVmTfIzR4WjeiqMTaOOlcHLx5dCn1ZWXqBB7WmnIaiJHeuFLBdpx i26T9AB2A2+m1TwDzVlB/HUseHnBsKd2xyoQhVg1oNnXPqBg/7hE7we7xiwlURL9wrU7Lj hzEf3xHj2qsVyhCtA4+QL4qqeEJDbOa+hxC4r2+WyVo0rozjGEtP9dcUAVn19iLHPhnPdb dGpxjgZz8w2wlMCv/61gNqTm/00YkCkNqlC+oKjhHhjGwn/O/qoNiR6hURX9eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672049019; 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=WITK8bD1Ir6Ylw3kJgRuIAetNZGSWAj0Ac4Gls7YYQA=; b=XpZfpZfBS5lX4hYifjEbxYAH2RDVKO8fP6RbHlYEkrOBb4qy6aMW9KDJF7V9k2KpEh0ZnL 26WoPZQyK7au3LCoi693cC9nrocCfqln6c3byvPTIbhb5MPhkN5JB3f5+Nx2doA9imL8aZ K5sKoDVL1xcJ7RizI7jU6JMXXCuUe7wkwEVPfnWEwInpbEP2C+XMxLxjpJeFffcwrwHD/h lzxfBW2vysR4a0FNpwpG5j0aKWfSTsViBVvnudeoWCCilIwMfbopNN4nQ0mJaM5I9HD5Hm dl5F9dwkKmDkJsDbHu/DEVAg5uNseTfQQMaP7q5gY4AOvL7IXnhKDFRPPw/bTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672049019; a=rsa-sha256; cv=none; b=G8c2QsmyEPPM9uwU9/HjTft54z/+sLR6MhOG5ZHmxz6aZYMK01KMUacoe3mKvSpuvkZbCe ozHzWXZtp/3PoFjiUOU/hgJUhdt2PGvfElPqrk+YhFgKVKnC0bEChyCVzEQyaBu99IOnJN oDmvsxbUPMvZsRfwFKr9qSbepHRnECbb5hsgJ5ZCvQhboDwDE4d/xU1447nmJmRKk4B+oY c4VHw/prEDuRpA3zxmFa/7deUHl+/7rch7lSAeQGtyWlfMTHBnX2cjduT6HDyDcKNeB3Rm oeKsRFPpMkCEiX+LCq0nILTZFk7e1WSa9ni0LudKCFmxvrzErc/oUBHLSI/oLA== 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 4NgYJq11X8zSJx; Mon, 26 Dec 2022 10:03:39 +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 2BQA3dAH027248; Mon, 26 Dec 2022 10:03:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BQA3d5p027247; Mon, 26 Dec 2022 10:03:39 GMT (envelope-from git) Date: Mon, 26 Dec 2022 10:03:39 GMT Message-Id: <202212261003.2BQA3d5p027247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: bdef65773efa - main - lang/gnat12: force rpath List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdef65773efa68423025d01e6b024c5387e29fb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=bdef65773efa68423025d01e6b024c5387e29fb8 commit bdef65773efa68423025d01e6b024c5387e29fb8 Author: Thierry Thomas AuthorDate: 2022-12-23 09:47:35 +0000 Commit: Thierry Thomas CommitDate: 2022-12-26 10:03:36 +0000 lang/gnat12: force rpath When lang/gcc12 is also installed, the programs installed by gnat12 might load libraries of gcc12. This could become problematic if these two ports get different versions. Modification inspired by lang/gcc6-aux/files/diff-core. --- lang/gnat12/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile index 7f0dd7389a05..ace641064c31 100644 --- a/lang/gnat12/Makefile +++ b/lang/gnat12/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnat12 PORTVERSION= 12.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GCC}:gcc \ LOCAL/thierry:gnat @@ -108,6 +108,8 @@ PLIST_SUB+= 64BITS="" .endif pre-configure: + ${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" | ${XARGS} \ + ${REINPLACE_CMD} -e 's|!static:[[:blank:]]|!static: --hash-style=gnu -rpath ${PREFIX}/gnat${GCCVER}/lib |' ${ECHO} "-=> GNAT ${OS_LABEL4VERS}" > ${REVFILE} ${ECHO} "release" > ${PHASEFILE}