diff options
| author |   Tupone Alfredo <tupone@gentoo.org> | 2018-11-26 21:55:48 +0100 |
|---|---|---|
| committer | Tupone Alfredo <tupone@gentoo.org> | 2018-11-26 21:55:48 +0100 |
| commit | b851df513cc39a2268329423365e48bddcb758e0 (patch) | |
| tree | 30224173d47737a9ed5b7bf3b3c945c95efa1b43 | |
| parent | dev-ada/libadalang: Stable (diff) | |
| download | gentoo-b851df513cc39a2268329423365e48bddcb758e0.tar.gz gentoo-b851df513cc39a2268329423365e48bddcb758e0.tar.bz2 gentoo-b851df513cc39a2268329423365e48bddcb758e0.zip | |
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
| -rw-r--r-- | dev-ada/gprbuild/files/gprbuild-2017-config.patch | 4 | ||||
| -rw-r--r-- | 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 cb37dd58dd2d..5dcd58ffb21d 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 df5101ac4bfc..d279f478a5e8 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() { |