dev-ada/gprbuild: Fix build with -Wl,-r

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

diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
index cb37dd58dd2d07232ca183f9922c402fef0049f2..5dcd58ffb21da7539c8f3bc613567814c1112ca3 100644 (file)
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
@@ -107,7 +107,7 @@
           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");
++         for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
     end case;
      </config>
    </configuration>
@@ -116,7 +116,7 @@
      </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");
++   for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
      </config>
    </configuration>
  

diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
index df5101ac4bfc2dc6aa01ccb4614b50f1d98593a7..d279f478a5e887147148b33defdcf57db5c6323c 100644 (file)
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -50,6 +50,12 @@ src_prepare() {
                -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
                src/gprlib.adb \
                || die
+       if use gnat_2016; then
+               sed -i \
+                       -e 's:"-no-pie", ::g' \
+                       share/gprconfig/linker.xml \
+                       || die
+       fi
 }
 
 src_configure() {