commit: 778901b50d7e1b0f09ff48274db2de8229a1d503
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 23 07:23:25 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 07:53:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778901b5
dev-ada/gprbuild: use AR or NM env instead
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 -----------
dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 5 +++--
dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 5 +++--
dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch | 5 +++--
dev-ada/gprbuild/gprbuild-2021-r2.ebuild | 2 +-
5 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
deleted file mode 100644
index 77f0cfead7ed..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-2021-nm.patch
b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
index 2bf41a8e1b07..9fcab1565857 100644
--- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@@ -1,11 +1,12 @@
--- a/share/gprconfig/linker.xml 2021-12-21 21:36:45.306813518 +0100
+++ b/share/gprconfig/linker.xml 2021-12-21 22:20:21.642668870 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
<host name="^i686.*-linux.*$" />
</hosts>
<config>
- for Object_Lister use ("nm", "-g");
-+ for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++ NM := External("NM", "nm");
++ for Object_Lister use (NM, "-g");
for Object_Lister_Matcher use " [TDRB] (.*)";
LDFLAGS := External_As_List ("LDFLAGS", " ");
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
index 452733493ace..6a9513473bf9 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
@@ -1,11 +1,12 @@
--- 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 @@
+@@ -877,7 +877,8 @@
<host name="^x86_64-.*linux.*" />
</hosts>
<config>
- for Archive_Builder use ("ar", "cr");
-+ for Archive_Builder use ("${HOST(Ada)}-ar", "cr");
++ AR := External("AR", "ar");
++ for Archive_Builder use (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-nm.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
index 4455e8befffa..062d7960fce7 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@@ -1,11 +1,12 @@
--- a/share/gprconfig/linker.xml 2021-12-21 22:36:01.054738486 +0100
+++ b/share/gprconfig/linker.xml 2021-12-21 22:36:59.973738600 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
<host name="^i686.*-linux.*$" />
</hosts>
<config>
- for Object_Lister use ("nm", "-g");
-+ for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++ NM := External("NM", "nm");
++ for Object_Lister use (NM, "-g");
for Object_Lister_Matcher use " [TDRB] (.*)";
package Linker is
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 405996ac11c4..8bfc6af4419b 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
- "${FILESDIR}"/${P}-ar.patch
+ "${FILESDIR}"/${PN}-22.0.0-ar.patch
)
src_prepare() {
