Tweak the x32 fix so it works for native builds too.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index a496d2b952eb61fb3bdcf30c9bffba726c24f297..72ff81a21ba361fa61083efcd72b92a596fccc4d 100644 (file)
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.153 2011/12/07 06:40:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.154 2011/12/08 20:27:24 vapier Exp $
+
+  08 Dec 2011; Mike Frysinger <vapier@gentoo.org>
+  files/gmp-5.0.2-x32-support.patch:
+  Tweak the x32 fix so it works for native builds too.
 
   07 Dec 2011; Mike Frysinger <vapier@gentoo.org> gmp-5.0.2_p1.ebuild,
   +files/gmp-5.0.2-x32-bugfix.patch, +files/gmp-5.0.2-x32-support.patch:

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index ebd1b46cc43f8ce78828c3bcce91ce5c1b39bc15..e3eb068950b8ace5e2971100b072978e4c5b33b1 100644 (file)
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -9,7 +9,7 @@ AUX gmp-5.0.1-perfpow-test.patch 1071 RMD160 1af4778602a55cda15763687329348c5ebd
 AUX gmp-5.0.1-x86-nopie-tests.patch 3798 RMD160 2086849c394e35753ca84a464ac9e0c32165fd23 SHA1 97a0ce472b36754ecdd5416bd7c5a2aad4766087 SHA256 3f108ece1cf1f18afd8a36f2b9f03eeb32afa9c4937c707bce840bd62824a61a
 AUX gmp-5.0.2-unnormalised-dividends.patch 682 RMD160 feb31d040fdfedf4212e86676be92b2adf852c76 SHA1 81ca793feccb31e322d0791a4946f79c4b7c8e92 SHA256 6d7c4f4d9eaba14ac6d3364f26e849963be3149727cbfe5ee64cc588587dd8c5
 AUX gmp-5.0.2-x32-bugfix.patch 3213 RMD160 ca051f09a8b38982c148d7f4c8cdde1c2da5d5bc SHA1 0d02223d42df385186341ffd71b2f44cde590b72 SHA256 d83142808943778f95d37c416a53a369f0e6acd39bd5f8e77bb08efcb4623a25
-AUX gmp-5.0.2-x32-support.patch 973 RMD160 498ed5b9aa61441a32a6a3e79e6e5f0b3e791c60 SHA1 3f3716ebe4076487ae40b0aebc7daff47812e57d SHA256 faf52b3f4348ce36820f15c697119c088cb761d7dd5858f6cc665002f487bb63
+AUX gmp-5.0.2-x32-support.patch 854 RMD160 58d3b67e7c82ee48d2c78a0b700d77e3d8caad97 SHA1 6af38676700f1fd0ade1ab341dbad8080d5bbd67 SHA256 3eb0e6f511adc1efd61208955254e2c205705eabf74ac062939b14fc4b026b66
 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
 DIST gmp-5.0.2.tar.bz2 2024576 RMD160 fce06e3246f067301a54f3457960f1d6d71adfc2 SHA1 2968220e1988eabb61f921d11e5d2db5431e0a35 SHA256 dbc2db76fdd4e99f85d5e35aa378ed62c283e0d586b91bd8703aff75a7804c28
@@ -19,12 +19,12 @@ EBUILD gmp-4.3.2.ebuild 1995 RMD160 d4123b138aa96f8084dd652c886ae8a117551411 SHA
 EBUILD gmp-5.0.1.ebuild 2458 RMD160 b60ffd9a8f150317c51e8ac7cc06d40a39e19201 SHA1 5e6bb32b4ba660fad1fa5ce0d9e33947426f591f SHA256 8a7b8f7fadb14fb6c92881e6f0e063422ea9c6ecf57e0c3f1ffe0b08dcf945d0
 EBUILD gmp-5.0.2.ebuild 2401 RMD160 f0b499f7fcff913c9524e921c99bb83b6ef18efa SHA1 cce01d6f3d3d718ed6c23b182569e69272abeee5 SHA256 821f373781aa8ef2209a8a2a6f47acb103f1be20aa0b566289641ea24d48136a
 EBUILD gmp-5.0.2_p1.ebuild 2777 RMD160 a6a1fb2ae0ed548a63845700d4e8b4a3aa366b87 SHA1 89d5c9bd25a875a4cccb369c571984dc7ea268ba SHA256 effd830eb558585a072b69ab2a1bbce9dee5be69f792e24c1dfb652fbd86ca9e
-MISC ChangeLog 20609 RMD160 cf23cb408cdb5fc9e83ffbb2ba371164e181c4f3 SHA1 2a2fe49cb4a143713183046031fd39355c3af249 SHA256 2bcbb3e0c41e1ca960b3358d089c086d619b63f833d38937b55562746a34b466
+MISC ChangeLog 20752 RMD160 29090af1f52446a98b5e38c964f2f5fe3ea81008 SHA1 f549bba80bda2e87e2e029b2470c82ba51e88c88 SHA256 38a4497c0d5cf8f34e99b235f3ced3948d99cc653985a6ef024135b781b03865
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7fCn0ACgkQaC/OocHi7Ja0vwD/cUrxB7JU7ZsKlPtDI1s3ORi3
-i5WTOt14GocTzqp9clAA/ig/Rjr4zrJoToJgAI1ncYSILlGVTEkBTg9Y3PzZE1n4
-=HoGX
+iF4EAREIAAYFAk7hHboACgkQaC/OocHi7JatEQD+NXjpi0AJcSZo9/d73uKO9u6X
+IkROid2nu71YqsO0z/IBAIMmX8GJj+SlZvgT86T+mP2E3PgbXvWoL+vUOtE7izYj
+=dZav
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch b/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch
index ecb9bdb2d05e0153d5be7d32ca30e36d85d54b0b..28efee0a5eed84ba9aff7611fb8e16a0fadb3138 100644 (file)
--- a/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch
+++ b/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch
@@ -8,7 +8,7 @@ Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
 
 --- gmp-4.3.2/configure
 +++ gmp-4.3.2/configure
-@@ -1499,6 +1499,25 @@ case $host in
+@@ -1499,6 +1499,21 @@
            path_64="x86_64/atom x86_64"
            ;;
        esac
@@ -16,8 +16,6 @@ Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
 +      # X32 support.
 +      case x"$path_64" in
 +        xx86_64*)
-+          case x"$CC $CFLAGS" in
-+            x*-mx32*)
 +              abilist="x32 64 32"
 +              path_x32="$path_64"
 +              limb_x32=longlong
@@ -27,14 +25,12 @@ Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
 +              CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
 +              SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
 +              cyclecounter_size_x32=2
-+              ;;
-+          esac
 +          ;;
 +      esac
        ;;
      esac
      ;;
-@@ -3039,7 +3058,7 @@ if test "$gmp_asm_syntax_testing" != no;
+@@ -3039,7 +3058,7 @@
   ;;
          esac
            ;;