| 1 |
commit: 78913ef011e8aaf88033f9ad8cdc235d118fccf7 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 24 19:17:22 2017 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 24 19:17:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78913ef0 |
| 7 |
|
| 8 |
sci-mathematics/flint: Fix FTBFS with PIE enabled |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/608704 |
| 11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 12 |
|
| 13 |
sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch | 17 +++++++++++++++++ |
| 14 |
sci-mathematics/flint/flint-2.4.4-r1.ebuild | 3 ++- |
| 15 |
sci-mathematics/flint/flint-2.4.5.ebuild | 3 ++- |
| 16 |
sci-mathematics/flint/flint-2.5.2.ebuild | 2 ++ |
| 17 |
4 files changed, 23 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..5689e3633ee |
| 22 |
--- /dev/null |
| 23 |
+++ b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch |
| 24 |
@@ -0,0 +1,17 @@ |
| 25 |
+Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled |
| 26 |
+Author: Logan Rosen <logan@××××××.com> |
| 27 |
+Forwarded: yes |
| 28 |
+ |
| 29 |
+diff --git a/Makefile.subdirs b/Makefile.subdirs |
| 30 |
+index ec05fb0..f2d8b37 100644 |
| 31 |
+--- a/Makefile.subdirs |
| 32 |
++++ b/Makefile.subdirs |
| 33 |
+@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c |
| 34 |
+ $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@" |
| 35 |
+ |
| 36 |
+ $(MOD_LOBJ): $(LOBJS) |
| 37 |
+- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib |
| 38 |
++ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib |
| 39 |
+ |
| 40 |
+ -include $(LOBJS:.lo=.d) |
| 41 |
+ |
| 42 |
|
| 43 |
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild |
| 44 |
index aca6c9be941..1068395a40c 100644 |
| 45 |
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild |
| 46 |
+++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild |
| 47 |
@@ -30,7 +30,8 @@ src_prepare() { |
| 48 |
epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \ |
| 49 |
"${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \ |
| 50 |
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \ |
| 51 |
- "${FILESDIR}"/${PN}-2.4.4-test.patch |
| 52 |
+ "${FILESDIR}"/${PN}-2.4.4-test.patch \ |
| 53 |
+ "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch |
| 54 |
|
| 55 |
sed -i \ |
| 56 |
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \ |
| 57 |
|
| 58 |
diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild |
| 59 |
index a8293b9632a..b36ea8b5f2b 100644 |
| 60 |
--- a/sci-mathematics/flint/flint-2.4.5.ebuild |
| 61 |
+++ b/sci-mathematics/flint/flint-2.4.5.ebuild |
| 62 |
@@ -32,7 +32,8 @@ src_prepare() { |
| 63 |
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \ |
| 64 |
"${FILESDIR}"/${PN}-2.4.4-test.patch \ |
| 65 |
"${FILESDIR}"/${PN}-2.4.5-gmp6-compat.patch \ |
| 66 |
- "${FILESDIR}"/${PN}-2.4.5-ntl62.patch |
| 67 |
+ "${FILESDIR}"/${PN}-2.4.5-ntl62.patch \ |
| 68 |
+ "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch |
| 69 |
|
| 70 |
sed -i \ |
| 71 |
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \ |
| 72 |
|
| 73 |
diff --git a/sci-mathematics/flint/flint-2.5.2.ebuild b/sci-mathematics/flint/flint-2.5.2.ebuild |
| 74 |
index 0217ae0600c..64f94ae79dc 100644 |
| 75 |
--- a/sci-mathematics/flint/flint-2.5.2.ebuild |
| 76 |
+++ b/sci-mathematics/flint/flint-2.5.2.ebuild |
| 77 |
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND} |
| 78 |
)" |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
+ epatch "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch |
| 82 |
+ |
| 83 |
sed -i \ |
| 84 |
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \ |
| 85 |
./configure || die |
Archives