summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2022-03-19 23:06:55 +0100
committerAlfredo Tupone <tupone@gentoo.org>2022-03-19 23:06:55 +0100
commitf0ab2fe76dbbb4a425fcc6885e19e5845c940da3 (patch)
treef43f73ddc7bff7ee86d173804e0082b194b99701 /dev-ada/gprbuild
parentprofiles: mask openldap-2.6.1 (hangs in configure) (diff)
downloadgentoo-f0ab2fe76dbbb4a425fcc6885e19e5845c940da3.tar.gz
gentoo-f0ab2fe76dbbb4a425fcc6885e19e5845c940da3.tar.bz2
gentoo-f0ab2fe76dbbb4a425fcc6885e19e5845c940da3.zip
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 <tupone@gentoo.org>
Diffstat (limited to 'dev-ada/gprbuild')
-rw-r--r--dev-ada/gprbuild/files/gprbuild-2021-runpath.patch11
-rw-r--r--dev-ada/gprbuild/gprbuild-2021-r3.ebuild (renamed from dev-ada/gprbuild/gprbuild-2021-r2.ebuild)3
-rw-r--r--dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild (renamed from dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild)1
3 files changed, 14 insertions, 1 deletions
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
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
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() {