dev-ada/gprbuild: use AR or NM env instead

Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone <[email protected]>
johu · Dec 23, 2021 · 778901b · 778901b
1 parent df70fe0
commit 778901b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
diff --git 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
@@ -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
@@ -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
@@ -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() {