| 1 |
commit: 473ba9da56f59fc0bb59045d51629d14dd0c00b8 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 30 19:31:00 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 30 19:31:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473ba9da |
| 7 |
|
| 8 |
dev-ada/gprbuild: add -no-pie |
| 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-2018-gentoo.patch | 11 ++++++++++- |
| 14 |
dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 9 +-------- |
| 15 |
2 files changed, 11 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch |
| 18 |
index 1f967b61d4c..34936ea1f52 100644 |
| 19 |
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch |
| 20 |
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch |
| 21 |
@@ -264,12 +264,21 @@ |
| 22 |
</configuration> |
| 23 |
--- a/share/gprconfig/linker.xml 2018-10-17 21:36:15.856883517 +0200 |
| 24 |
+++ b/share/gprconfig/linker.xml 2018-10-17 21:35:15.985896804 +0200 |
| 25 |
+@@ -1025,7 +1025,7 @@ |
| 26 |
+ </targets> |
| 27 |
+ <config> |
| 28 |
+ for Library_Partial_Linker use |
| 29 |
+- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); |
| 30 |
++ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); |
| 31 |
+ </config> |
| 32 |
+ </configuration> |
| 33 |
+ |
| 34 |
@@ -1044,7 +1044,7 @@ |
| 35 |
</targets> |
| 36 |
<config> |
| 37 |
for Library_Partial_Linker use |
| 38 |
- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); |
| 39 |
-+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); |
| 40 |
++ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); |
| 41 |
</config> |
| 42 |
</configuration> |
| 43 |
|
| 44 |
|
| 45 |
diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild |
| 46 |
index 719ce8ae472..a1157f5c370 100644 |
| 47 |
--- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild |
| 48 |
+++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild |
| 49 |
@@ -30,9 +30,7 @@ REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )" |
| 50 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
- if use gnat_2016; then |
| 54 |
- GCC_PV=4.9.4 |
| 55 |
- elif use gnat_2017; then |
| 56 |
+ if use gnat_2017; then |
| 57 |
GCC_PV=6.3.0 |
| 58 |
else |
| 59 |
GCC_PV=7.3.1 |
| 60 |
@@ -49,10 +47,6 @@ src_prepare() { |
| 61 |
-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ |
| 62 |
src/gprlib.adb \ |
| 63 |
|| die |
| 64 |
-# sed -i \ |
| 65 |
-# -e "s:\"-Wl,-r\":\"-r\":g" \ |
| 66 |
-# share/gprconfig/linker.xml \ |
| 67 |
-# || die |
| 68 |
} |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
@@ -88,6 +82,5 @@ src_install() { |
| 72 |
doins share/gprconfig/* |
| 73 |
insinto /usr/share/gpr |
| 74 |
doins share/_default.gpr |
| 75 |
- insinto /usr/share/gprconfig |
| 76 |
einstalldocs |
| 77 |
} |
Archives