| 1 |
commit: 65393f623e12c9c9114567bde5de298d5c82eee9 |
| 2 |
Author: Keri Harris <keri <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 19 15:42:41 2017 +0000 |
| 4 |
Commit: Keri Harris <keri <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 19 15:42:41 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65393f62 |
| 7 |
|
| 8 |
dev-lang/gprolog: apply upstream patch for PIC-aware GPLC. Closes #403693 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.0, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-lang/gprolog/files/gprolog-pic-code.patch | 12 ++++++++++++ |
| 13 |
dev-lang/gprolog/gprolog-1.4.4.ebuild | 6 +----- |
| 14 |
2 files changed, 13 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/gprolog/files/gprolog-pic-code.patch b/dev-lang/gprolog/files/gprolog-pic-code.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..a85aea0746e |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-lang/gprolog/files/gprolog-pic-code.patch |
| 21 |
@@ -0,0 +1,12 @@ |
| 22 |
+diff -ur gprolog-1.4.4.orig/src/Ma2Asm/x86_64_any.c gprolog-1.4.4/src/Ma2Asm/x86_64_any.c |
| 23 |
+--- gprolog-1.4.4.orig/src/Ma2Asm/x86_64_any.c 2013-04-22 13:52:16.000000000 +0200 |
| 24 |
++++ gprolog-1.4.4/src/Ma2Asm/x86_64_any.c 2017-07-19 17:27:37.057124771 +0200 |
| 25 |
+@@ -204,7 +204,7 @@ |
| 26 |
+ strcpy(asm_reg_cp, Off_Reg_Bank(MAP_OFFSET_CP)); |
| 27 |
+ #endif |
| 28 |
+ |
| 29 |
+-#ifdef M_x86_64_darwin |
| 30 |
++#if defined(M_x86_64_darwin) || defined(M_x86_64_linux) |
| 31 |
+ pic_code = 1; /* NB: on darwin everything is PIC code */ |
| 32 |
+ #elif defined(_WIN32) |
| 33 |
+ pic_code = 0; /* NB: on MinGW nothing is needed for PIC code */ |
| 34 |
|
| 35 |
diff --git a/dev-lang/gprolog/gprolog-1.4.4.ebuild b/dev-lang/gprolog/gprolog-1.4.4.ebuild |
| 36 |
index 7116f2c8c4d..4d915c78666 100644 |
| 37 |
--- a/dev-lang/gprolog/gprolog-1.4.4.ebuild |
| 38 |
+++ b/dev-lang/gprolog/gprolog-1.4.4.ebuild |
| 39 |
@@ -20,6 +20,7 @@ RDEPEND="" |
| 40 |
|
| 41 |
src_prepare() { |
| 42 |
epatch "${FILESDIR}"/${P}-ldflags.patch |
| 43 |
+ epatch "${FILESDIR}"/${P}-pic-code.patch |
| 44 |
epatch "${FILESDIR}"/${P}-links.patch |
| 45 |
epatch "${FILESDIR}"/${P}-nodocs.patch |
| 46 |
epatch "${FILESDIR}"/${P}-txt-file.patch |
| 47 |
@@ -31,11 +32,6 @@ src_configure() { |
| 48 |
append-flags -fno-strict-aliasing |
| 49 |
use debug && append-flags -DDEBUG |
| 50 |
|
| 51 |
- if gcc-specs-pie ; then |
| 52 |
- # gplc generates its own native ASM; disable PIE |
| 53 |
- append-ldflags -nopie |
| 54 |
- fi |
| 55 |
- |
| 56 |
cd "${S}"/src |
| 57 |
econf \ |
| 58 |
CFLAGS_MACHINE="${CFLAGS_MACHINE}" \ |
Archives