summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/gmp/ChangeLog6
-rw-r--r--dev-libs/gmp/Manifest31
-rw-r--r--dev-libs/gmp/files/gmp-5.0.5-x32-support.patch41
-rw-r--r--dev-libs/gmp/gmp-5.0.5.ebuild4
4 files changed, 64 insertions, 18 deletions
diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index b6137d195e70..5b249b741629 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.168 2012/05/06 18:16:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.169 2012/05/22 23:12:49 vapier Exp $
+
+ 22 May 2012; Mike Frysinger <vapier@gentoo.org>
+ +files/gmp-5.0.5-x32-support.patch, gmp-5.0.5.ebuild:
+ Redo x32 patch for newer versions.
*gmp-5.0.5 (06 May 2012)
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index cdfdde1b8858..183fe574a012 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -10,6 +10,7 @@ AUX gmp-5.0.1-x86-nopie-tests.patch 3798 RMD160 2086849c394e35753ca84a464ac9e0c3
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 854 RMD160 58d3b67e7c82ee48d2c78a0b700d77e3d8caad97 SHA1 6af38676700f1fd0ade1ab341dbad8080d5bbd67 SHA256 3eb0e6f511adc1efd61208955254e2c205705eabf74ac062939b14fc4b026b66
+AUX gmp-5.0.5-x32-support.patch 814 RMD160 92ff3cdfb1a709e111b9d743a2593637215efe3a SHA1 2c53f6e3a2981c75c5f9d3fd569677a06a3cae5f SHA256 14c4fce531809942441e032fe9dc19ab904e39fc3405689b9dfff96ceb5291c0
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
@@ -27,23 +28,23 @@ EBUILD gmp-5.0.2.ebuild 2400 RMD160 749fdef4f722fde37ae46ff467de79b071f3eaea SHA
EBUILD gmp-5.0.2_p1.ebuild 2842 RMD160 7d723a9f842c747b9f26e098b2fa50cb9b81d429 SHA1 60556b579c5f165169fea15a4b19dcc4e11cb3db SHA256 7631e4e1703d8bcd6098bd4dbda141f402a627bb52da8cc424e5d771a0f72b63
EBUILD gmp-5.0.3.ebuild 2765 RMD160 79d6af82aad0bb570234e794417cfe616cff749a SHA1 4471e66931b3eafa1926af7e33f3c8dba89dc6b4 SHA256 528f4aed6b044fb4a8c8fa86bb50ae7960329b03a5d3b11cd5d4945a4e20bc75
EBUILD gmp-5.0.4.ebuild 2761 RMD160 df6830d7f97802587375135c9c6ea16393d2b11f SHA1 cae70d68d59d5ad508156d2d6c76514f85f3e328 SHA256 96b6aee15c93e99469a140052e4b2dac8a1556db35c6c2d122eae407309f6be5
-EBUILD gmp-5.0.5.ebuild 2759 RMD160 a0ac302c461dc3ce9cecb08a94789b561859b27d SHA1 9a221a42c5cccb6d4e5d5fb6369d57532bb5645c SHA256 6029d46c30ac4db8cc343966bd9aebdc564adf84fd37b4b7249a7f0a23494d46
-MISC ChangeLog 22284 RMD160 392da83db5fc458a91fe00168d060c691a0a3a6b SHA1 b37f6575671ffb5ef6ee1f519be42dcdd06d1a55 SHA256 b2cc8901771d4c6c22c4bc3b2c2ed549b5440ee3347d652c0221accb9992b411
+EBUILD gmp-5.0.5.ebuild 2759 RMD160 6a259eb9146be6874c44f0af51065a18cac2d8e0 SHA1 1a5654021ac144c300c91118ef0360089566feb0 SHA256 5db00b82a974c7da6f5b9b78ea27d5948bc99c5b02d2a43796e9dbd3679e2451
+MISC ChangeLog 22428 RMD160 e3b2ed28afc0d79337330a16fa2ba0258ab9e541 SHA1 32a51826f7c27cda6b7efa63961d6e2f692b3585 SHA256 931f60cc8cf5f7a830385deda35c61b0766151a170e87db2ce19ce67bb3ee34a
MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBAgAGBQJPpsBTAAoJELEHsLL7fEFWkwUQALFMQ71vfysF58vefe5S8BRo
-rVwnKVIighduuRaNXpy+RzeJDssSUNdvcmde7YquGM+afmxR4MaM8bJpg4QLG63J
-/p3oKyRI2F/osMNroI2UjhuhEgWFMxtZF7JYY3rTCGyNkVuErrHDJsZmS921KTCe
-4d2RaEluILVT6Ti2CJaeQiwBr6slvZxMxTgkgh0tqABEAZjtgbyjtygSYHDhGPiv
-20ZbYZA1PdYpGXyX/mMVZXLJL+IQI3rmBS9j8SHeqEwjkAg7dT2XGMNl8ORSSWJY
-JMpO3HTeS8HQmCaOHbxKSv+ikVfY//OnvwXNVM2P7KuXTxQtvDEP2i3AfYkaHh/6
-Xs+CdokXE1vDrJnRW21ISObPQBUgeJcwpRQq2fYYU/GPKxemPZhAzrWltqpoLPyQ
-Kn7kIPTznxxIsI3U/BtQf6m2g5fFrbTkUlgkalsLBJhvrvPmrjy48f1OMOtYarRM
-k8kBiSnSfps14Y2JPiOtzmLxrN6DaHr7KOPkNKOVYmWI/qxybtAUMEOt5oaZ2fiZ
-kXdAsbKddaDdqP9Wj8ThP0SixPp0MkUwqgz0hLwr3ioL58TvsnsN0aTv8Rzn+bFJ
-aFi7rT2GmpW4hk11XOdce2brJl6A+pv9MXlDpxXSwVlgeeKeF74BfaHGweZFSPBC
-98sXpqP0fEqhUPR6eWiW
-=8F6s
+iQIcBAEBAgAGBQJPvB26AAoJELEHsLL7fEFWV3EQAKivDcvB3KWZLVeCgy5jqxcH
+SaLKg8/IQjEB8EPC/jvmvnSw1Kmb1QGuCbblziumRAwZtcFLGLWpbSeJBS6Of6BM
+3CuHGnkVIFH462HAz8BQIAuuC1nBlK7BaY62N7NA6iYALQKp71UJK1MzvwIJRrVz
+hw/pAs4LOBsxCOgE0Q9suZxtQaGY4J6X4XJre/3KFdCyM9pjqHZe1RVyRw7+lCtN
+gfvIjVl5EVATTN629+TubC+veOOWjfH97+2hPyqjhR9lbHZo6+4KRAnTFVq2FaSr
+oSG5jPnJjki4hmnIBLQfNjBlZueHUMD+X3L0GOCyoqI2RFpyAX+tq3XIBpdbD3O7
+GQlBNvKgr1h37YoTVcxeaR3NkCPCwgQfqte/pseS19pvLP5M+vQaWqu0Qp95ybQV
+qQMgId1CqJPcINfqFpwg9sQ/M2mw4dUxiSqsvFR+fExDJYbnATS3Ge0E+oVvMG1Z
+UMxMyhAm7cacV/BoJiDtQpV+BUwzTo8RoDgeafhnhu8J9VQ0IwiXF5OYia91lr2F
+YC9zIL7aDRfyFRSF8FCq0JdXT01mrtmO4fJsVJM3qUXx7g8rqUxJJymWAArGqDvt
+VNrGnZOpcV7wRF9uDPnBQ2/ocm1f7IdjONM1dbzHBkOBMkYPurRRos/wIkdDOn4n
+zSOoEhI30K4ekcznBXNM
+=ZXi8
-----END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch b/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
new file mode 100644
index 000000000000..b6867bf03abe
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
@@ -0,0 +1,41 @@
+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.0.5/configure
++++ gmp-5.0.5/configure
+@@ -5189,6 +5189,21 @@
+ esac
+ ;;
+ esac
++
++ # 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='amd64call.lo amd64check$U.lo'
++ SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
++ cyclecounter_size_x32=2
++ ;;
++ esac
+ ;;
+
+
+@@ -3039,7 +3058,7 @@
+ ;;
+ esac
+ ;;
+- 64)
++ 64|x32)
+
+ echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
+
diff --git a/dev-libs/gmp/gmp-5.0.5.ebuild b/dev-libs/gmp/gmp-5.0.5.ebuild
index 12f8f9d632fa..fc8421522b9b 100644
--- a/dev-libs/gmp/gmp-5.0.5.ebuild
+++ b/dev-libs/gmp/gmp-5.0.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.5.ebuild,v 1.1 2012/05/06 18:16:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.5.ebuild,v 1.2 2012/05/22 23:12:49 vapier Exp $
inherit flag-o-matic eutils libtool unpacker toolchain-funcs
@@ -28,7 +28,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.2-x32-support.patch
+ epatch "${FILESDIR}"/${PN}-5.0.5-x32-support.patch
# disable -fPIE -pie in the tests for x86 #236054
if use x86 && gcc-specs-pie ; then