summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2021-12-22 22:53:03 +0100
committerAlfredo Tupone <tupone@gentoo.org>2021-12-22 22:53:03 +0100
commit2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180 (patch)
tree8681e0500ffdab7470f8b331097257d34a37dd0f /dev-ada/gprbuild
parentdev-lang/typescript: add 4.5.4 (diff)
downloadgentoo-2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180.tar.gz
gentoo-2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180.tar.bz2
gentoo-2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180.zip
dev-ada/gprbuild: use chost-ar
Closes: https://bugs.gentoo.org/829701 Closes: https://bugs.gentoo.org/736036 Package-Manager: Portage-3.0.28, 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-ar.patch11
-rw-r--r--dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch11
-rw-r--r--dev-ada/gprbuild/gprbuild-2021-r2.ebuild1
-rw-r--r--dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild1
4 files changed, 24 insertions, 0 deletions
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
new file mode 100644
index 000000000000..77f0cfead7ed
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100
++++ b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100
+@@ -864,7 +864,7 @@
+ <host name="^x86_64-.*linux.*" />
+ </hosts>
+ <config>
+- for Archive_Builder use ("ar", "cr");
++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr");
+ for Archive_Builder_Append_Option use ("q");
+ for Archive_Indexer use ("ranlib");
+ for Archive_Suffix use ".a";
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
new file mode 100644
index 000000000000..452733493ace
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100
++++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100
+@@ -877,7 +877,7 @@
+ <host name="^x86_64-.*linux.*" />
+ </hosts>
+ <config>
+- for Archive_Builder use ("ar", "cr");
++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr");
+ for Archive_Builder_Append_Option use ("q");
+ for Archive_Indexer use ("ranlib");
+ for Archive_Suffix use ".a";
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 40a16cb9b2d4..405996ac11c4 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
+ "${FILESDIR}"/${P}-ar.patch
)
src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 2a07d5e4d71d..06eb16e01235 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
+ "${FILESDIR}"/${P}-ar.patch
)
src_prepare() {