summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/gmp/ChangeLog6
-rw-r--r--dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch130
-rw-r--r--dev-libs/gmp/gmp-5.0.1.ebuild9
3 files changed, 142 insertions, 3 deletions
diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 269827600cd8..62ab174bef23 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/gmp
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.135 2010/07/09 22:54:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.136 2010/07/27 02:33:18 zorry Exp $
+
+ 27 Jul 2010; Magnus Granberg <zorry@gentoo.org> gmp-5.0.1.ebuild,
+ +files/gmp-5.0.1-x86-nopie-tests.patch:
+ fix the TEXTREL #236054 thanks Joshua Pettett
09 Jul 2010; Mike Frysinger <vapier@gentoo.org> gmp-5.0.1.ebuild:
Move elibtoolize up so it patches configure correctly #327091 by Alan
diff --git a/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch b/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch
new file mode 100644
index 000000000000..e2ec26f4de2c
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch
@@ -0,0 +1,130 @@
+2010-07-27 Magnus Granberg <zorry@gentoo.org>
+
+ #236054
+ tests/Makefile.in add -nopie to CFLAGS
+ test/misc/Makefile.in likewise
+ test/mpbsd/Makefile.in likewise
+ test/mpf/Makefile.in likewise
+ test/mpn/Makefile.in likewise
+ test/mpq/Makefile.in likewise
+ test/mpz/Makefile.in likewise
+ test/randMakefile.in likewise
+ test/cxx/Makefile.in likewise and CXXFLAGS
+
+--- a/tests/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/devel/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/devel/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/misc/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/misc/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/mpbsd/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/mpbsd/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/mpf/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/mpf/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/mpn/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/mpn/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/mpq/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/mpq/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/mpz/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/mpz/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/rand/Makefile.in 2010-07-27 00:53:05.000000000 +0000
++++ b/tests/rand/Makefile.in 2010-07-27 00:35:10.000000000 +0000
+@@ -200,7 +200,7 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+--- a/tests/cxx/Makefile.in 2010-02-06 12:43:21.000000000 +0000
++++ b/tests/cxx/Makefile.in 2010-07-27 01:31:43.000000000 +0000
+@@ -189,13 +189,13 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -nopie
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CPP_FOR_BUILD = @CPP_FOR_BUILD@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -nopie
+ CYGPATH_W = @CYGPATH_W@
+ DEFN_LONG_LONG_LIMB = @DEFN_LONG_LONG_LIMB@
+ DEFS = @DEFS@
diff --git a/dev-libs/gmp/gmp-5.0.1.ebuild b/dev-libs/gmp/gmp-5.0.1.ebuild
index e287b26e2e47..5e092832b44e 100644
--- a/dev-libs/gmp/gmp-5.0.1.ebuild
+++ b/dev-libs/gmp/gmp-5.0.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.1.ebuild,v 1.4 2010/07/09 22:54:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.1.ebuild,v 1.5 2010/07/27 02:33:18 zorry Exp $
-inherit flag-o-matic eutils libtool flag-o-matic
+inherit flag-o-matic eutils libtool flag-o-matic toolchain-funcs
DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
HOMEPAGE="http://gmplib.org/"
@@ -21,6 +21,11 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
epatch "${FILESDIR}"/${PN}-5.0.0-s390.diff
+ # disable -fPIE -pie in the tests for x86 #236054
+ if use x86 && gcc-specs-pie ; then
+ epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
+ fi
+
# note: we cannot run autotools here as gcc depends on this package
elibtoolize