| 1 |
commit: 2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 22 21:53:03 2021 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 22 21:53:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f80ac2e |
| 7 |
|
| 8 |
dev-ada/gprbuild: use chost-ar |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/829701 |
| 11 |
Closes: https://bugs.gentoo.org/736036 |
| 12 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 13 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 +++++++++++ |
| 16 |
dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 11 +++++++++++ |
| 17 |
dev-ada/gprbuild/gprbuild-2021-r2.ebuild | 1 + |
| 18 |
dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild | 1 + |
| 19 |
4 files changed, 24 insertions(+) |
| 20 |
|
| 21 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..77f0cfead7ed |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch |
| 26 |
@@ -0,0 +1,11 @@ |
| 27 |
+--- a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100 |
| 28 |
++++ b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100 |
| 29 |
+@@ -864,7 +864,7 @@ |
| 30 |
+ <host name="^x86_64-.*linux.*" /> |
| 31 |
+ </hosts> |
| 32 |
+ <config> |
| 33 |
+- for Archive_Builder use ("ar", "cr"); |
| 34 |
++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); |
| 35 |
+ for Archive_Builder_Append_Option use ("q"); |
| 36 |
+ for Archive_Indexer use ("ranlib"); |
| 37 |
+ for Archive_Suffix use ".a"; |
| 38 |
|
| 39 |
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch |
| 40 |
new file mode 100644 |
| 41 |
index 000000000000..452733493ace |
| 42 |
--- /dev/null |
| 43 |
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch |
| 44 |
@@ -0,0 +1,11 @@ |
| 45 |
+--- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100 |
| 46 |
++++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100 |
| 47 |
+@@ -877,7 +877,7 @@ |
| 48 |
+ <host name="^x86_64-.*linux.*" /> |
| 49 |
+ </hosts> |
| 50 |
+ <config> |
| 51 |
+- for Archive_Builder use ("ar", "cr"); |
| 52 |
++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); |
| 53 |
+ for Archive_Builder_Append_Option use ("q"); |
| 54 |
+ for Archive_Indexer use ("ranlib"); |
| 55 |
+ for Archive_Suffix use ".a"; |
| 56 |
|
| 57 |
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild |
| 58 |
index 40a16cb9b2d4..405996ac11c4 100644 |
| 59 |
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild |
| 60 |
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild |
| 61 |
@@ -32,6 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" |
| 62 |
PATCHES=( |
| 63 |
"${FILESDIR}"/${P}-gentoo.patch |
| 64 |
"${FILESDIR}"/${P}-nm.patch |
| 65 |
+ "${FILESDIR}"/${P}-ar.patch |
| 66 |
) |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
|
| 70 |
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild |
| 71 |
index 2a07d5e4d71d..06eb16e01235 100644 |
| 72 |
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild |
| 73 |
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild |
| 74 |
@@ -31,6 +31,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" |
| 75 |
PATCHES=( |
| 76 |
"${FILESDIR}"/${P}-gentoo.patch |
| 77 |
"${FILESDIR}"/${P}-nm.patch |
| 78 |
+ "${FILESDIR}"/${P}-ar.patch |
| 79 |
) |
| 80 |
|
| 81 |
src_prepare() { |
Archives