From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 951BB15808B for ; Sat, 19 Mar 2022 22:07:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 462DBE08BD; Sat, 19 Mar 2022 22:07:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5258E08BD for ; Sat, 19 Mar 2022 22:07:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F7AD343831 for ; Sat, 19 Mar 2022 22:07:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD02131A for ; Sat, 19 Mar 2022 22:07:17 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1647727615.f0ab2fe76dbbb4a425fcc6885e19e5845c940da3.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gprbuild/files/gprbuild-2021-runpath.patch dev-ada/gprbuild/gprbuild-2021-r2.ebuild dev-ada/gprbuild/gprbuild-2021-r3.ebuild dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild X-VCS-Directories: dev-ada/gprbuild/files/ dev-ada/gprbuild/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: f0ab2fe76dbbb4a425fcc6885e19e5845c940da3 X-VCS-Branch: master Date: Sat, 19 Mar 2022 22:07:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 425cb039-46f4-4919-8146-b246a92d5c56 X-Archives-Hash: 27e969521478c99e670d4a314f04ce13 commit: f0ab2fe76dbbb4a425fcc6885e19e5845c940da3 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Mar 19 22:06:55 2022 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Mar 19 22:06:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ab2fe7 dev-ada/gprbuild: fix NULL DT_RUNPATH Closes: https://bugs.gentoo.org/834701 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-runpath.patch | 11 +++++++++++ .../{gprbuild-2021-r2.ebuild => gprbuild-2021-r3.ebuild} | 3 ++- .../{gprbuild-22.0.0-r1.ebuild => gprbuild-22.0.0-r2.ebuild} | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch new file mode 100644 index 000000000000..9224a09f9049 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch @@ -0,0 +1,11 @@ +--- a/gpr/src/gpr-util.adb 2022-03-19 22:41:32.372348082 +0100 ++++ b/gpr/src/gpr-util.adb 2022-03-19 22:41:54.325010633 +0100 +@@ -3634,7 +3634,7 @@ + end if; + end loop; + +- return Ret; ++ return Ret(1 .. Length - Separator'Length); + end; + end Concat_Paths; + diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild similarity index 96% rename from dev-ada/gprbuild/gprbuild-2021-r2.ebuild rename to dev-ada/gprbuild/gprbuild-2021-r3.ebuild index 8bfc6af4419b..3aeaaf969f80 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch "${FILESDIR}"/${PN}-22.0.0-ar.patch + "${FILESDIR}"/${P}-runpath.patch ) src_prepare() { diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild similarity index 98% rename from dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild rename to dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild index 97506af95abf..63740fc4c7a9 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch "${FILESDIR}"/${P}-ar.patch + "${FILESDIR}"/${PN}-2021-runpath.patch ) src_prepare() {