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 | 8ffd124f966a41a0a6f54a2729ffa65f126a7712 (patch) | |
| tree | 174c2df638b6c64cdd58c2a0afd2ab08677bfae4 | |
| parent | Fix building with libtool >= 2.4 wrt #339298 by John Ellson and Jimmy Jazz. (diff) | |
| download | gentoo-2-8ffd124f966a41a0a6f54a2729ffa65f126a7712.tar.gz gentoo-2-8ffd124f966a41a0a6f54a2729ffa65f126a7712.tar.bz2 gentoo-2-8ffd124f966a41a0a6f54a2729ffa65f126a7712.zip | |
Simply set GMPABI and remove other hackery (bug #344613).
(Portage version: 2.1.9.24/cvs/Linux i686)
| -rw-r--r-- | dev-libs/gmp/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/gmp/gmp-4.3.2.ebuild | 17 |
2 files changed, 8 insertions, 14 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/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" } |