Fix x32 builds #451038 by Zenitur.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 69 insertions, 24 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index e5ac8fd2b2d1..e67aa2ebcd63 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.171 2012/12/24 18:49:45 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.172 2013/01/10 19:51:04 vapier Exp $
+
+  10 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/gmp-5.1.0-x32-support.patch, gmp-5.1.0.ebuild:
+  Fix x32 builds #451038 by Zenitur.
 
   24 Dec 2012; Mike Frysinger <vapier@gentoo.org>
   +files/gmp-5.1.0-x86-nopie-tests.patch, gmp-5.1.0.ebuild:
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 75fcb727d98a..b5837ce8bf66 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -11,6 +11,7 @@ AUX gmp-5.0.2-unnormalised-dividends.patch 682 SHA256 6d7c4f4d9eaba14ac6d3364f26
 AUX gmp-5.0.2-x32-bugfix.patch 3213 SHA256 d83142808943778f95d37c416a53a369f0e6acd39bd5f8e77bb08efcb4623a25 SHA512 4f2121e48e61e0ed27dddbdbecc6ccb9eb1907ca89685a3e05b5c2a13f77d53e5611afd91bf71c014d4a421e6708ab04ffbcc2484e4e1047e6cf4ca94d60f4de WHIRLPOOL fd1dddcf002714cfbe624eb7dbb8124fccdd6aff63de6463826ba6e906da52f8476eb819709b4a6a35026d50b5cfdeb6af23fa071c38e76ec46508d169a60c33
 AUX gmp-5.0.2-x32-support.patch 854 SHA256 3eb0e6f511adc1efd61208955254e2c205705eabf74ac062939b14fc4b026b66 SHA512 901eb8f32214a6e522c43aeee12a1cedca261364a739f795b30aea65c724df97f9ec49326e93aac3b9537300e57da3528d009778d3dec372805e82ccdc66964e WHIRLPOOL dc74a3783394516d8c9c8fbded0bc7301efbc430d590a740c5b88bfe64cab664f316559a100433bbcde3f8cb5f706ddb1cc261973a5c1dffd647fa30f7631a7b
 AUX gmp-5.0.5-x32-support.patch 814 SHA256 14c4fce531809942441e032fe9dc19ab904e39fc3405689b9dfff96ceb5291c0 SHA512 33715037c9d9c6eb163e02f310a5acaa71e3e223695aacd8d89876ec7cf6c7f0e46f5c06de80b3e505adeb22042a0402368a3da8dba723c3d71ed2fd9106a3ac WHIRLPOOL 07fac2080d5f8ce9c7e71d7047f10999379683fbd495fbd16780a6c1c75cecaaa560251455c4d18c7c9e7873b68a0090b91badeb2e4ceea2b948b76ee445e1c9
+AUX gmp-5.1.0-x32-support.patch 1075 SHA256 42f7b91f86f33bd645d2b8fac300397653b702436e6295c0157758b91cfe2611 SHA512 924a0f09273dad63c1bf31f8b5d976306bab2ab8abc7bc67f6f45ca21ead729eb2c321e9581261d672e090d5f44d2d3cecb993fa74d312e6429a2ecefcfb6cac WHIRLPOOL f4c543d51e0d925159ad39a19ce4a55fb5819e63124f0b4ca4092a13297e5d59f6d24d9de6fa6e1c2189d170af667e313589f1892fc0d116633f266d27ed5830
 AUX gmp-5.1.0-x86-nopie-tests.patch 3471 SHA256 d4dfd1468495feb2a012acec2ce3e54dc1e090eccf91caac68c4b71417ae1311 SHA512 d1bbb832122e56f5def8113061e0fb326e09a766f64dab00ace4c43df1b5803b3b3c03da5c4be0788e66f484c48db3a61fa1b822110bdbfc9c667eac27b4c643 WHIRLPOOL 608a6ee796f56f9cdb499433051ccfc4a1f75386d9949546ec3792de11a370214c643a7e69bd534b17cbc2efff50e6fb0ceac1aa4806deeacc97d67560527ade
 DIST gmp-4.3.2.tar.bz2 1897483 SHA256 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775 SHA512 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf WHIRLPOOL ab3d9c95b436df3782830da0874307d5577b83c111c2fae4a9063d4083f97c5c12643b154c1bd9a588945e5a677fb8ab416c394ced3e9b0aa671b2238bcb9b40
 DIST gmp-5.0.1.tar.bz2 2006109 SHA256 a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb SHA512 9a128f7e192e5f1233ec068b04ba4789cd10ae1ca1a21d1089b9b596022f7dfb66c313599b5de462135b1556a8f8e72bce1b5f4666b1eeed1652e3d7f2f5d168 WHIRLPOOL e19602c9914ed0bcd60aa198cb6f4b35a8f133381808f0a0f0759987407aa8e356bf8cba99b4f4e44f526412a80ee1dbdd6fd2adaa88f8aaa1c7e7e881626f9a
@@ -32,23 +33,23 @@ EBUILD gmp-5.0.2_p1.ebuild 2842 SHA256 7631e4e1703d8bcd6098bd4dbda141f402a627bb5
 EBUILD gmp-5.0.3.ebuild 2765 SHA256 528f4aed6b044fb4a8c8fa86bb50ae7960329b03a5d3b11cd5d4945a4e20bc75 SHA512 910d8abd30caced65698b35c2c0952bca95a949e5739e34c840bf7ccb4f811c5599968f4941dc46eef466a2e3da8ef737858cd65c6b2743b677f69c6fbdc3ba3 WHIRLPOOL 5cca010d59b5d72b6dcc2b63bf6acf12ea70cdb2c5881420f68f3de032738ce1ad53b4862d899cd18ae2d3ad57fc04ff490a731e1aa88d22956e8158d326e534
 EBUILD gmp-5.0.4.ebuild 2761 SHA256 96b6aee15c93e99469a140052e4b2dac8a1556db35c6c2d122eae407309f6be5 SHA512 d4540c5a3450b606441577dec1af437cf09721d4cbb0270f9ac630d23b57f01c7449db2941ce97e9541f2fded333c705db01bf911224c923682b6b0d1f369010 WHIRLPOOL d44520d7d9a5e81de7ec6cb661f6a64bc2acdad1f60e747ba61559607f79049f5098dae4fe4fb7924ed760b5bffc9d27d13c8d58053bd4431d8e8d31c6666c2d
 EBUILD gmp-5.0.5.ebuild 2759 SHA256 5db00b82a974c7da6f5b9b78ea27d5948bc99c5b02d2a43796e9dbd3679e2451 SHA512 90e70ba4e9b93ebfb1d3fb780408c0f3558a7a81e55ea102dea2bc5c08cb85f11a273eede7171561988c873708ae1273a7a679dfb9be347dd8d035fe7982824a WHIRLPOOL a76bcf9cdb2b301704475faaecaedaf62b8e047caad370995b81b2e532b1743a9186763d4cfbb8675c3c587262fa068f17d1b390c8d0fcf5460ccd46ceef7dc6
-EBUILD gmp-5.1.0.ebuild 2808 SHA256 31dc8551cc0df237320c707e831da7e7a07d213c2fe55d9e112aa5445013bebe SHA512 4e9657d487a3dde3d7503328e25b9d89b12064afda366fce90eaaa48bc2f67bd447f94b16e6d312c185964dccc12948dc3785090202d2ae81d90e106ca90f427 WHIRLPOOL af10c9c0c129fd431cd8765d0ae15266e6839260abb5138b1fa22609491a88185a69c25530bd11c2c81b038cf5dab99bf4e92a67cc213f9e93e9f341ea41b75d
-MISC ChangeLog 22700 SHA256 50f11f72bae483d4dc98b501a73abfe3958fafdb1a52f2493b5a12b36c71b53b SHA512 3f465d7ce00d81ca57754f5723c510501a1c31181f6a0de9928654b5c50cc843b91b95f92776fdf8d3c6dc27cd9e550b5c72d67a14ab6f1366fc2f8269e2defb WHIRLPOOL 4e66eb12349ab95c44726b330ef33b9d812db894e65579e02ffd323e7e9cc875fe8949cf2ddfe5d13f24aa5b4e2d9dc75635c8ff76212a585e65b935a8d4d2bc
+EBUILD gmp-5.1.0.ebuild 2775 SHA256 2e4a0cb6f3bde9b8b4b27eeaf179c9ab8a29dc878fbbad44f236095976025ad8 SHA512 6317cd86e0aa36314225a0cde9d82c2931df8f9a5d272c2b32d1da19c9b74c3aa1d5afb95c79047569763f91d9a1297ba31ab3dbd1c211662fd9bfc120d951b4 WHIRLPOOL 6fa4e09fd0722de0450858046d44e48e143003ddb9cc72d081058eec32cbcb0f9a5d5b81e2e2b5ff9fe24af35124a10be92bb7364fe6a91bf08b3c20bf04b16a
+MISC ChangeLog 22844 SHA256 77c7aa8ff6374baf9510094829ec342a7528bc6aa29a6ed280b348abd0315dee SHA512 7662634acd04c61c17457c5599fd6b3d09273ee8f01b2ade3f152bf43e411a1114d014b423e3d5ff8e73046daaaa8ef72410856f90338538ff3ad851d97b7f34 WHIRLPOOL 861cc9b6f846b482e267a348e45cc850f5f89ae48a7d88e3b94765205fac3d2f69be348649d7ee5d077c889e1a2608269f17aa9a8fed8878dfbef957e6425d01
 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ2KPuAAoJELEHsLL7fEFWIBAP/ApozNkpXlRv4YNSjEf7S1b8
-h8eHvu9bj6fM4+uMfZp9FDEN41TQBoylfPZgyWNyBoxND9NR66+kI6tBN8ypQIMV
-oqHiBpaS5KtrCNCPD8gZ+C/AOT6IGG5DC0geNK94pJaSwznZdIlK2IfcYOHpuFjR
-/FD0YVf444xqSWPsCoEv3nRNAqlsrP4thCSh7kesWb9kRuUL2T/pHcvHkXSgJZox
-gyLdUo7n9BKZ7cS8cEhCdY0ZEKCoGJxMnAJB5v8VRXAPOpzpiLO7MlnNFccpkubj
-Ge5sfsmSh/lzyMoVee9RV9JNDWZ1CmDWB2Gov8r8nX5hC73B0zTZjflbkp9w1Xh3
-2jfVmjfkCrY27NM8tlbk/foYbBtLzkePzUiacS+aTSBkaRvZ5BIncY7ZWq86W1Ul
-yF6yUM2pFrNIURyzHMSbPbkhgv19KZKbOxcIREFxyT5xD+WAC52aZkiKkbPz/n6A
-LDyMlS3rjLhrGiyHaHvGoKsmeT8FztvkA82n4LY8FVqVOs/Hf/39U4TgEJ5RBRzB
-ZBph+JZSX5nJZqa0bX6lgxRJHEtHJBexXBV3ZtNGjaqATj35CdgO0UQr1tw6kX4t
-WE6Q4Tmnhwz3vrZ0/JDnJp2VHUq41oLLmqMZmB4FLSQwV9jNNgEJzSzIVM5BJ7Cl
-KuKeOI3SI+AwIILRJRfL
-=vEBH
+iQIcBAEBCAAGBQJQ7xxKAAoJELEHsLL7fEFWDtoP/jAPo/MNm2+5Ddz2OQF7kXKM
+PnC/Cr5Osge8HwsTOAZ/QSSmOREvnwdqU7U0avkAutcexcrabzlD4VRlsn7HoGBx
+U+3lKlzlMCoTqnxHIZtZBrIj9VhkNgpJ4uAnP7KMSzelghLQzCmKtk0pUNUWY5E4
+qIbcSpYYuVPd58Q9ZiBEuDCgLKzsFjkgxZwZQ+1S3P/b8qa+6tMn7a0Ll105czcH
+p8LFP2B68M9aZpwnubHlk3SO8874BegE9nBDV4hKxM0ZmCClLqtia3HYceQQ9HvB
+V9GBVJqUAH8R0gkSMkOWPKY8nlxdHxgHP6rryY8rha9n3KLfWD80tnm2myYiWNgE
+2t2sj7hzqnozBGZyGH6KmLPO0Rs+f+a+ofHx+GEOIblHq9BVtbS1WxmOme8G3Som
+/K3gQwo5sL+ggbNPzfCYmlQhK1eovSytaFTF4nEdf8yCBa5hZEO8EGRUorXP0GMb
+SbTLZuvyL7OkuuiOWz1xlj9/sPMWusEvTkvpsYdcDaFTWip0N62VYs3EGzKdXcLi
+vCvc/k3GnTu3qXYZboDLy/we7CB0ZW5aAPEhkhiVNHP6KddNJTd7B6Pjzp9SEB76
+fUhWZBVScjWVjATDV+l3o/8Un1Q6ksM3G42UozJCAGuZNcvo3FQvHC774twt4FHr
+ictGoPpOrpXQUIiB3cuy
+=uvEa
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch b/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
new file mode 100644
index 000000000000..fda361d9b294
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Pending
+
+Add X32 support in gmp configure.
+
+Patch Originator: H J Lu @ Intel
+Patch modified for Yocto by Nitin Kamble
+Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
+
+--- gmp-5.1.0/configure
++++ gmp-5.1.0/configure
+@@ -5237,6 +5237,22 @@ echo "include_mpn(\`vax/elf.m4')" >> $gmp_tmpconfigm4i
+ 	    extra_functions_64="invert_limb_table"
+ 	fi
+ 
++	# X32 support.
++	case x"$path_64" in
++	  xx86_64*)
++		abilist="x32 64 32"
++		path_x32="$path_64"
++		limb_x32=longlong
++		cclist_x32="gcc"
++		gcc_x32_cflags="-O2 -mx32"
++		any_x32_testlist="sizeof-long-4"
++		CALLING_CONVENTIONS_OBJS_x32=$CALLING_CONVENTIONS_OBJS_64
++		SPEED_CYCLECOUNTER_OBJ_x32=$SPEED_CYCLECOUNTER_OBJ_64
++		cyclecounter_size_x32=$cyclecounter_size_64
++		extra_functions_x32=$extra_functions_64
++	    ;;
++	esac
++
+ 	case $host in
+ 	  *-*-solaris*)
+ 	    # Sun cc.
+@@ -28611,7 +28627,7 @@ echo "include_mpn(\`x86/darwin.m4')" >> $gmp_tmpconfigm4i
+  ;;
+ 	  esac
+           ;;
+-        64)
++        64|x32)
+ 
+ echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
+ 
diff --git a/dev-libs/gmp/gmp-5.1.0.ebuild b/dev-libs/gmp/gmp-5.1.0.ebuild
index c52d5d92ff7b..a8df635b6a85 100644
--- a/dev-libs/gmp/gmp-5.1.0.ebuild
+++ b/dev-libs/gmp/gmp-5.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.2 2012/12/24 18:49:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.3 2013/01/10 19:51:04 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -29,7 +29,7 @@ src_unpack() {
 	cd "${S}"
 	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
 	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.5-x32-support.patch
+	epatch "${FILESDIR}"/${PN}-5.1.0-x32-support.patch
 
 	# disable -fPIE -pie in the tests for x86  #236054
 	if use x86 && gcc-specs-pie ; then
@@ -44,7 +44,7 @@ src_unpack() {
 	mv configure configure.wrapped || die
 	cat <<-\EOF > configure
 	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
+	exec env ABI="$GMPABI" "$0.wrapped" "$@"
 	EOF
 	chmod a+rx configure
 }
@@ -67,10 +67,8 @@ src_compile() {
 	tc-export CC
 	econf \
 		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
 		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		|| die
+		$(use_enable static-libs static)
 
 	emake || die
 }