summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2017-07-28 21:41:41 +0000
committerSébastien Fabbro <bicatali@gentoo.org>2017-07-28 21:42:01 +0000
commit2c3bf701dff1c57800b8e2ada20559049714aef2 (patch)
tree85559accdf8a8be669e0ea89bce9f0c4031540f5 /sci-mathematics
parentdev-python/ipython: added sphinxcontrib_websupport dependency for documentation (diff)
downloadgentoo-2c3bf701dff1c57800b8e2ada20559049714aef2.tar.gz
gentoo-2c3bf701dff1c57800b8e2ada20559049714aef2.tar.bz2
gentoo-2c3bf701dff1c57800b8e2ada20559049714aef2.zip
sci-mathematics/arb: fixed for linking with PIE
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/arb/arb-2.11.1-r1.ebuild (renamed from sci-mathematics/arb/arb-2.11.1.ebuild)5
-rw-r--r--sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch17
2 files changed, 21 insertions, 1 deletions
diff --git a/sci-mathematics/arb/arb-2.11.1.ebuild b/sci-mathematics/arb/arb-2.11.1-r1.ebuild
index bea3d8d89ece..88e262a3d9fd 100644
--- a/sci-mathematics/arb/arb-2.11.1.ebuild
+++ b/sci-mathematics/arb/arb-2.11.1-r1.ebuild
@@ -21,6 +21,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-pie-ftbs.patch )
+
src_configure() {
# Not an autoconf configure script.
# Note that it appears to have been cloned from the flint configure script
@@ -31,7 +33,8 @@ src_configure() {
--with-flint="${EPREFIX}/usr" \
--with-gmp="${EPREFIX}/usr" \
--with-mpfr="${EPREFIX}/usr" \
- $(use_enable static-libs static) || die
+ $(use_enable static-libs static) \
+ CFLAGS="${CPPFLAGS} ${CFLAGS}" || die
}
src_compile() {
diff --git a/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch b/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch
new file mode 100644
index 000000000000..b2db6b2a294c
--- /dev/null
+++ b/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch
@@ -0,0 +1,17 @@
+Description: Use -r instead of -Wl,-r to fix FTBFS with PIE enabled
+Author: Logan Rosen
+Forwarded: yes
+
+diff --git a/Makefile.subdirs b/Makefile.subdirs
+index 3dc757d..f0ec923 100644
+--- a/Makefile.subdirs
++++ b/Makefile.subdirs
+@@ -52,7 +52,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
+ $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
+
+ $(MOD_LOBJ): $(LOBJS)
+- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
++ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+
+ -include $(LOBJS:.lo=.d)
+