diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-11-17 16:27:04 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-11-17 16:27:04 +0000 |
| commit | 78e58893a0dc40ae812e8bcf45ae636271941f76 (patch) | |
| tree | b12f8c2d3fb42418e69cf56f331709178696168f /dev-libs/gmp | |
| parent | Fix building with libtool >= 2.4 wrt #339298 by John Ellson and Jimmy Jazz. (diff) | |
| download | historical-78e58893a0dc40ae812e8bcf45ae636271941f76.tar.gz historical-78e58893a0dc40ae812e8bcf45ae636271941f76.tar.bz2 historical-78e58893a0dc40ae812e8bcf45ae636271941f76.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/gmp')
| -rw-r--r-- | dev-libs/gmp/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/gmp/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/gmp/gmp-4.3.2.ebuild | 17 |
3 files changed, 10 insertions, 16 deletions
diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog index 370032258cc7..e924fa267067 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.139 2010/11/16 21:01:19 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.140 2010/11/17 16:27:04 jer Exp $ + + 17 Nov 2010; Jeroen Roovers <jer@gentoo.org> gmp-4.3.2.ebuild: + Simply set GMPABI and remove other hackery (bug #344613). 16 Nov 2010; Jeroen Roovers <jer@gentoo.org> gmp-5.0.1.ebuild: Simply set GMPABI and remove other hackery (bug #344613). diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index 44aa59590fef..f3c0707fd57e 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -6,7 +6,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 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-4.3.2.ebuild 1963 RMD160 e8dd7000daafe704444de499eaece5306c98ec72 SHA1 84d404f81322cc037e1a621a72a293c0b48a9b7d SHA256 1bd3e7fa499676f99c38296e3394bc8dfb4ce3af596df52eb9db0dcdfdb3321f EBUILD gmp-5.0.1.ebuild 2442 RMD160 fddfce37f1a565776f5b3ffbcdf42e52f65d9352 SHA1 3b5df9648a1d2f027e264599943a50f1c918de17 SHA256 14a284243b7636a922f2cf69813e3093dacdcccf3922e44a75dd2ef0be3294cc -MISC ChangeLog 18542 RMD160 fd29421057b949586adeb5f522222113e7a72448 SHA1 a365340177ee548715f38131e6bc36a303662fcd SHA256 f4c197f939f963ccd2a5ead725468ac677239a62c46abca4dac336362fda4f86 +MISC ChangeLog 18668 RMD160 9301d090edadbd335f681bc58e1bd3fad1ec4fab SHA1 d283c12b43b483bfe91ea2493ae7abe3758d648a SHA256 0162b55a5a5143d1973908251c02b87fa44e4c8ea782dccaa0597b6575f4949b MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a diff --git a/dev-libs/gmp/gmp-4.3.2.ebuild b/dev-libs/gmp/gmp-4.3.2.ebuild index 4b44b755a150..e5417ccc80a9 100644 --- a/dev-libs/gmp/gmp-4.3.2.ebuild +++ b/dev-libs/gmp/gmp-4.3.2.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-4.3.2.ebuild,v 1.7 2010/04/16 17:43:11 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.3.2.ebuild,v 1.8 2010/11/17 16:27:04 jer Exp $ inherit flag-o-matic eutils libtool flag-o-matic @@ -30,11 +30,10 @@ src_unpack() { } src_compile() { - # GMP believes hppa2.0 is 64bit - local is_hppa_2_0 + # 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 - is_hppa_2_0=1 - export CHOST=${CHOST/2.0/1.1} + export GMPABI="1.0" fi # ABI mappings (needs all architectures supported) @@ -52,14 +51,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" } |