fix TEXTREL #236054

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 145 insertions, 15 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/Manifest b/dev-libs/gmp/Manifest
index e01a15c274d6..437563a8eb58 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gmp-4.1.4-noexecstack.patch 474 RMD160 22aa94eded1650432202b93a79900be1c85a779b SHA1 fd7ca0feb59aa319ba30bdbc71b7796a0a457d76 SHA256 68601777151a1628d7bc839eddd037685c5d2e76c9453166890a5eb3cf6000c3
 AUX gmp-4.2.1-s390.diff 1848 RMD160 04eecb2aaae4c444841e40b33abd38a662254632 SHA1 38ba90ffd6cd9d66e07c5f71b4608e3ad9d32a6b SHA256 13c6b01e71534af2c353d79b7afd171f158b8fa6e3299e0f7c0335e516ce67ec
 AUX gmp-4.3.2-ABI-multilib.patch 8883 RMD160 e6a41f288643af4a518ecc19ca5b04eb7f59a8a6 SHA1 4bb36169fd5d0e768b91a92194c6937680ab4b84 SHA256 772c003810d5f8073e6c2b6fea4ba7dfe38d7f7b14c25995be7d1ee7f45ab59f
 AUX gmp-5.0.0-s390.diff 1839 RMD160 2b83f296906a7a15add19b126f73059571b8880e SHA1 f5ca3a792c89384d3e7dd5ff36041b5d679ed76f SHA256 e4ca88304a072ad29387ad7893efc28ee2ce600dfe020f35f80e939c83c31b0c
+AUX gmp-5.0.1-x86-nopie-tests.patch 3798 RMD160 2086849c394e35753ca84a464ac9e0c32165fd23 SHA1 97a0ce472b36754ecdd5416bd7c5a2aad4766087 SHA256 3f108ece1cf1f18afd8a36f2b9f03eeb32afa9c4937c707bce840bd62824a61a
 DIST gmp-4.3.2.tar.bz2 1897483 RMD160 a8f3f41501ece290c348aeb4444bbea40bc53e71 SHA1 c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c SHA256 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775
 DIST gmp-5.0.1.tar.bz2 2006109 RMD160 3e89ebf5294639e1c926b92d9786bbdd0c8fa587 SHA1 6340edc7ceb95f9015a758c7c0d196eb0f441d49 SHA256 a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb
 EBUILD gmp-4.3.2.ebuild 2077 RMD160 d18d5f9dbd088734180ab6850640c077d4b5117d SHA1 f28f05c8e4468cfa4168c87e5aa8f83fe8be90b0 SHA256 d720ce4ada3dbfac3090661f531ede2c32e5396cc8dc7bbbaee4d06d6a43b56e
-EBUILD gmp-5.0.1.ebuild 2344 RMD160 7b1d855521566a257032e4134ca2cd3fcd24ce18 SHA1 d6681ca7559e1427113c4e167662dab7b8a94146 SHA256 35a4bd4d5a2d94a2990ba000c5c1a0f6684a0c4d32c25ea44b6b3f1d1169b672
-MISC ChangeLog 18002 RMD160 f00101596f8a71e3bafcb2c7ff454524f48598e7 SHA1 09ea83367b15a514529a5ba950f4de01671c3505 SHA256 31efef08301100bfd635fe9270defdcdd10150c215862a1645675b37ec465622
+EBUILD gmp-5.0.1.ebuild 2509 RMD160 4b00c0d4f22d728248a56890174391cc2d7f051f SHA1 305be2e7ee82e3e9cb0010bf531be14bc23291ac SHA256 da0291b89ce1fb7ba3e303efc1215af4945f59fd98b600a1f4005d5dba8a15a5
+MISC ChangeLog 18160 RMD160 7683f512ab8169bccbe4a016768658a6130dfed8 SHA1 590e2e255e176fed8469dc1e972c60bfde88ab60 SHA256 36cadacf08b77d68831f0a789aef86b1bdddbb3f3c6c9e1c815b4111ca58abdc
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkw3qC8ACgkQTwhj9JtAlp5cigD/SAJzX092lH2YzJdvd80VkZIm
-ysDAoFMrAFajMeQCpLsA/jO4KkzR1bSJ+sZrIyzOd0Vla/4OTuQDwteBgk5B5Mos
-=dMmn
------END PGP SIGNATURE-----
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