diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-11-16 21:01:19 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-11-16 21:01:19 +0000 |
| commit | 9d39d5cb8d25bfab2c61c1582cee59c62183f351 (patch) | |
| tree | 8d597ee0a878063b187076b91c031e96847ee2a0 /dev-libs | |
| parent | Moving to virtual/jpeg. (diff) | |
| download | historical-9d39d5cb8d25bfab2c61c1582cee59c62183f351.tar.gz historical-9d39d5cb8d25bfab2c61c1582cee59c62183f351.tar.bz2 historical-9d39d5cb8d25bfab2c61c1582cee59c62183f351.zip | |
Simply set GMPABI and remove other hackery (bug #344613).
Package-Manager: portage-2.1.9.24/cvs/Linux i686
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/gmp/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/gmp/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/gmp/gmp-5.0.1.ebuild | 16 |
3 files changed, 13 insertions, 12 deletions
diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog index 47ad9ed234c3..370032258cc7 100644 --- a/dev-libs/gmp/ChangeLog +++ b/dev-libs/gmp/ChangeLog @@ -1,6 +1,9 @@ # 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.138 2010/11/11 17:33:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.139 2010/11/16 21:01:19 jer Exp $ + + 16 Nov 2010; Jeroen Roovers <jer@gentoo.org> gmp-5.0.1.ebuild: + Simply set GMPABI and remove other hackery (bug #344613). 11 Nov 2010; Jeroen Roovers <jer@gentoo.org> gmp-5.0.1.ebuild: Remove HPPA hack (bug #344613 by Christian Franke). diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index d8a7cd70634b..44aa59590fef 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -7,6 +7,6 @@ AUX gmp-5.0.1-x86-nopie-tests.patch 3798 RMD160 2086849c394e35753ca84a464ac9e0c3 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 2409 RMD160 4d239a570d33e794971843dfc40681e20881fdd0 SHA1 1a1bb223fd9ade0ae349f05db22a168b0c5920e0 SHA256 939b2deae69df3661dec6c8d2589eb2c36df14029b28d0abd8185752c85af435 -MISC ChangeLog 18416 RMD160 6bc61c708911430894698919a21937b8f3e0427a SHA1 0ac508590921e61f423f952881564e42198aa70a SHA256 487f254eecb30fc43972dea87171e40c776ae2b541d292993b63c03914992e55 +EBUILD gmp-5.0.1.ebuild 2442 RMD160 fddfce37f1a565776f5b3ffbcdf42e52f65d9352 SHA1 3b5df9648a1d2f027e264599943a50f1c918de17 SHA256 14a284243b7636a922f2cf69813e3093dacdcccf3922e44a75dd2ef0be3294cc +MISC ChangeLog 18542 RMD160 fd29421057b949586adeb5f522222113e7a72448 SHA1 a365340177ee548715f38131e6bc36a303662fcd SHA256 f4c197f939f963ccd2a5ead725468ac677239a62c46abca4dac336362fda4f86 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a diff --git a/dev-libs/gmp/gmp-5.0.1.ebuild b/dev-libs/gmp/gmp-5.0.1.ebuild index 3894621e58f1..1ae1f58821b5 100644 --- a/dev-libs/gmp/gmp-5.0.1.ebuild +++ b/dev-libs/gmp/gmp-5.0.1.ebuild @@ -1,6 +1,6 @@ # 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.7 2010/11/11 17:33:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.1.ebuild,v 1.8 2010/11/16 21:01:19 jer Exp $ inherit flag-o-matic eutils libtool flag-o-matic toolchain-funcs @@ -41,6 +41,12 @@ src_unpack() { } src_compile() { + # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works + # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) + if [[ ${CHOST} == hppa2.0-* ]] ; then + export GMPABI="1.0" + fi + # ABI mappings (needs all architectures supported) case ${ABI} in 32|x86) GMPABI=32;; @@ -56,14 +62,6 @@ src_compile() { $(use_enable !nocxx cxx) \ || die "configure failed" - # Fix the ABI for hppa2.0 - if [[ -n ${is_hppa_2_0} ]] ; then - sed -i \ - -e 's:pa32/hppa1_1:pa32/hppa2_0:' \ - "${S}"/config.h || die - export CHOST=${CHOST/1.1/2.0} - fi - emake || die "emake failed" } |