| 1 |
commit: b851df513cc39a2268329423365e48bddcb758e0 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 26 20:55:48 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 26 20:55:48 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b851df51 |
| 7 |
|
| 8 |
dev-ada/gprbuild: Fix build with -Wl,-r |
| 9 |
|
| 10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-ada/gprbuild/files/gprbuild-2017-config.patch | 4 ++-- |
| 14 |
dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 6 ++++++ |
| 15 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch |
| 18 |
index cb37dd58dd2..5dcd58ffb21 100644 |
| 19 |
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch |
| 20 |
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch |
| 21 |
@@ -107,7 +107,7 @@ |
| 22 |
null; |
| 23 |
when others => |
| 24 |
- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); |
| 25 |
-+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); |
| 26 |
++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); |
| 27 |
end case; |
| 28 |
</config> |
| 29 |
</configuration> |
| 30 |
@@ -116,7 +116,7 @@ |
| 31 |
</targets> |
| 32 |
<config> |
| 33 |
- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); |
| 34 |
-+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); |
| 35 |
++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); |
| 36 |
</config> |
| 37 |
</configuration> |
| 38 |
|
| 39 |
|
| 40 |
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild |
| 41 |
index df5101ac4bf..d279f478a5e 100644 |
| 42 |
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild |
| 43 |
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild |
| 44 |
@@ -50,6 +50,12 @@ src_prepare() { |
| 45 |
-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ |
| 46 |
src/gprlib.adb \ |
| 47 |
|| die |
| 48 |
+ if use gnat_2016; then |
| 49 |
+ sed -i \ |
| 50 |
+ -e 's:"-no-pie", ::g' \ |
| 51 |
+ share/gprconfig/linker.xml \ |
| 52 |
+ || die |
| 53 |
+ fi |
| 54 |
} |
| 55 |
|
| 56 |
src_configure() { |
Archives