| 1 |
commit: 778901b50d7e1b0f09ff48274db2de8229a1d503 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 23 07:23:25 2021 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 23 07:53:05 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778901b5 |
| 7 |
|
| 8 |
dev-ada/gprbuild: use AR or NM env instead |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 ----------- |
| 14 |
dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 5 +++-- |
| 15 |
dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 5 +++-- |
| 16 |
dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch | 5 +++-- |
| 17 |
dev-ada/gprbuild/gprbuild-2021-r2.ebuild | 2 +- |
| 18 |
5 files changed, 10 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index 77f0cfead7ed..000000000000 |
| 23 |
--- a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,11 +0,0 @@ |
| 26 |
---- a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100 |
| 27 |
-+++ b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100 |
| 28 |
-@@ -864,7 +864,7 @@ |
| 29 |
- <host name="^x86_64-.*linux.*" /> |
| 30 |
- </hosts> |
| 31 |
- <config> |
| 32 |
-- for Archive_Builder use ("ar", "cr"); |
| 33 |
-+ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); |
| 34 |
- for Archive_Builder_Append_Option use ("q"); |
| 35 |
- for Archive_Indexer use ("ranlib"); |
| 36 |
- for Archive_Suffix use ".a"; |
| 37 |
|
| 38 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch |
| 39 |
index 2bf41a8e1b07..9fcab1565857 100644 |
| 40 |
--- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch |
| 41 |
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch |
| 42 |
@@ -1,11 +1,12 @@ |
| 43 |
--- a/share/gprconfig/linker.xml 2021-12-21 21:36:45.306813518 +0100 |
| 44 |
+++ b/share/gprconfig/linker.xml 2021-12-21 22:20:21.642668870 +0100 |
| 45 |
-@@ -128,7 +128,7 @@ |
| 46 |
+@@ -128,7 +128,8 @@ |
| 47 |
<host name="^i686.*-linux.*$" /> |
| 48 |
</hosts> |
| 49 |
<config> |
| 50 |
- for Object_Lister use ("nm", "-g"); |
| 51 |
-+ for Object_Lister use ("${HOST(Ada)}-nm", "-g"); |
| 52 |
++ NM := External("NM", "nm"); |
| 53 |
++ for Object_Lister use (NM, "-g"); |
| 54 |
for Object_Lister_Matcher use " [TDRB] (.*)"; |
| 55 |
|
| 56 |
LDFLAGS := External_As_List ("LDFLAGS", " "); |
| 57 |
|
| 58 |
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch |
| 59 |
index 452733493ace..6a9513473bf9 100644 |
| 60 |
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch |
| 61 |
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch |
| 62 |
@@ -1,11 +1,12 @@ |
| 63 |
--- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100 |
| 64 |
+++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100 |
| 65 |
-@@ -877,7 +877,7 @@ |
| 66 |
+@@ -877,7 +877,8 @@ |
| 67 |
<host name="^x86_64-.*linux.*" /> |
| 68 |
</hosts> |
| 69 |
<config> |
| 70 |
- for Archive_Builder use ("ar", "cr"); |
| 71 |
-+ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); |
| 72 |
++ AR := External("AR", "ar"); |
| 73 |
++ for Archive_Builder use (AR, "cr"); |
| 74 |
for Archive_Builder_Append_Option use ("q"); |
| 75 |
for Archive_Indexer use ("ranlib"); |
| 76 |
for Archive_Suffix use ".a"; |
| 77 |
|
| 78 |
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch |
| 79 |
index 4455e8befffa..062d7960fce7 100644 |
| 80 |
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch |
| 81 |
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch |
| 82 |
@@ -1,11 +1,12 @@ |
| 83 |
--- a/share/gprconfig/linker.xml 2021-12-21 22:36:01.054738486 +0100 |
| 84 |
+++ b/share/gprconfig/linker.xml 2021-12-21 22:36:59.973738600 +0100 |
| 85 |
-@@ -128,7 +128,7 @@ |
| 86 |
+@@ -128,7 +128,8 @@ |
| 87 |
<host name="^i686.*-linux.*$" /> |
| 88 |
</hosts> |
| 89 |
<config> |
| 90 |
- for Object_Lister use ("nm", "-g"); |
| 91 |
-+ for Object_Lister use ("${HOST(Ada)}-nm", "-g"); |
| 92 |
++ NM := External("NM", "nm"); |
| 93 |
++ for Object_Lister use (NM, "-g"); |
| 94 |
for Object_Lister_Matcher use " [TDRB] (.*)"; |
| 95 |
|
| 96 |
package Linker is |
| 97 |
|
| 98 |
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild |
| 99 |
index 405996ac11c4..8bfc6af4419b 100644 |
| 100 |
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild |
| 101 |
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild |
| 102 |
@@ -32,7 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" |
| 103 |
PATCHES=( |
| 104 |
"${FILESDIR}"/${P}-gentoo.patch |
| 105 |
"${FILESDIR}"/${P}-nm.patch |
| 106 |
- "${FILESDIR}"/${P}-ar.patch |
| 107 |
+ "${FILESDIR}"/${PN}-22.0.0-ar.patch |
| 108 |
) |
| 109 |
|
| 110 |
src_prepare() { |
Archives