[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/

[Alfredo Tupone]

commit:     33ee6ad467f517fb273a3facb3321a06a1c185d8
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 21:06:12 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 21:06:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ee6ad4

dev-ada/gprbuild: Fix linker file

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-ada/gprbuild/files/gprbuild-2017-config.patch | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
index 72f1fd829c1..cb37dd58dd2 100644
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
@@ -102,12 +102,21 @@
     </configuration>
 --- a/share/gprconfig/linker.xml	2018-10-27 09:43:17.934862859 +0200
 +++ b/share/gprconfig/linker.xml	2018-10-27 09:43:54.127304471 +0200
-@@ -742,7 +742,7 @@
-    for Shared_Library_Suffix use ".sl";
-    for Library_Auto_Init_Supported use "true";
-    for Run_Path_Option  use ("-Wl,+b,");
--   for Library_Partial_Linker use ("gcc", "-nostdlib", "-Wl,-r", "-o");
-+   for Library_Partial_Linker use ("gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
+@@ -814,7 +814,7 @@
+       when "arm-android" | "arm-linux-androideabi" =>
+          null;
+       when others =>
+-         for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
+    end case;
+     </config>
+   </configuration>
+@@ -830,7 +830,7 @@
+        <target name="^.*linux.*$" />
+     </targets>
+     <config>
+-   for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
++   for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
+     </config>
+   </configuration>
  
-    package Linker is
-       for Max_Command_Line_Length use "5000";