From ca901d8defa4b4c3c1ddeb129f8fdf15268625ab Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 25 Feb 2016 04:49:22 +0900 Subject: dev-libs/gmp: work around broken clang during noexecstack detection --- .../gmp/files/gmp-6.1.0-noexecstack-detect.patch | 23 ++++++++++++++++++++++ dev-libs/gmp/gmp-6.1.0.ebuild | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 dev-libs/gmp/files/gmp-6.1.0-noexecstack-detect.patch (limited to 'dev-libs/gmp') diff --git a/dev-libs/gmp/files/gmp-6.1.0-noexecstack-detect.patch b/dev-libs/gmp/files/gmp-6.1.0-noexecstack-detect.patch new file mode 100644 index 000000000000..558ba60d080a --- /dev/null +++ b/dev-libs/gmp/files/gmp-6.1.0-noexecstack-detect.patch @@ -0,0 +1,23 @@ +gmp's -Wa,--noexecstack check is based on glibc's, so backport a change +that went into it there: +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=215a87451d1fd623fd2699fa57f16f8ab6f6a2f3 +https://sourceware.org/bugzilla/show_bug.cgi?id=6428 + +this is to workaround broken clang assembler that fails w/CFLAGS=-g: +http://crbug.com/585930 +https://llvm.org/bugs/show_bug.cgi?id=11740 + +patch has been sent upstream too: +https://gmplib.org/list-archives/gmp-bugs/2016-February/003916.html + +--- a/configure ++++ b/configure +@@ -11339,7 +11339,7 @@ EOF + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } \ + && grep .note.GNU-stack conftest.s >/dev/null \ +- && { ac_try='${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack ++ && { ac_try='${CC} $ASMFLAGS -Wa,--noexecstack + -c -o conftest.o conftest.s >/dev/null' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild index 6bc3b8fff4d5..e97c46f7cb2b 100644 --- a/dev-libs/gmp/gmp-6.1.0.ebuild +++ b/dev-libs/gmp/gmp-6.1.0.ebuild @@ -38,6 +38,8 @@ src_prepare() { # note: we cannot run autotools here as gcc depends on this package elibtoolize + epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch + # GMP uses the "ABI" env var during configure as does Gentoo (econf). # So, to avoid patching the source constantly, wrap things up. mv configure configure.wrapped || die -- cgit v1.2.3-65-gdbad