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

[Alfredo Tupone]

commit:     b851df513cc39a2268329423365e48bddcb758e0
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 26 20:55:48 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 20:55:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b851df51

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

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 | 4 ++--
 dev-ada/gprbuild/gprbuild-2017-r1.ebuild          | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch 
b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
index cb37dd58dd2..5dcd58ffb21 100644
--- 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 df5101ac4bf..d279f478a5e 100644
--- 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() {