diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2007-06-19 12:16:56 -0700 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2007-06-19 12:16:56 -0700 |
commit | 910d011b37c448e66b988d266cdd2b97b869740c (patch) | |
tree | 9df1fa32cec4e10012fb2583a7be014a7bf7eeaf /dev-libs | |
parent | coot: fix build with guile 1.8 / gmp 4.2.1 (diff) | |
download | dberkholz-910d011b37c448e66b988d266cdd2b97b869740c.tar.gz dberkholz-910d011b37c448e66b988d266cdd2b97b869740c.tar.bz2 dberkholz-910d011b37c448e66b988d266cdd2b97b869740c.zip |
gmp: revbump to be ahead of portage again
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/gmp/Manifest | 18 | ||||
-rw-r--r-- | dev-libs/gmp/files/digest-gmp-4.2.1-r2 (renamed from dev-libs/gmp/files/digest-gmp-4.2.1-r1) | 1 | ||||
-rw-r--r-- | dev-libs/gmp/files/gmp-4.2.1-s390.diff | 68 | ||||
-rw-r--r-- | dev-libs/gmp/gmp-4.2.1-r2.ebuild (renamed from dev-libs/gmp/gmp-4.2.1-r1.ebuild) | 25 |
4 files changed, 97 insertions, 15 deletions
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index a547614..25cdffe 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -26,12 +26,16 @@ AUX gmp-4.2.1-ABI-multilib.patch 12390 RMD160 934645555459cabcf4c2f0e1ea0a6a7143 MD5 c4ebcc92089f50c5918a83b8a6d2122e files/gmp-4.2.1-ABI-multilib.patch 12390 RMD160 934645555459cabcf4c2f0e1ea0a6a7143387a81 files/gmp-4.2.1-ABI-multilib.patch 12390 SHA256 d5fa3b9cd07036abc99d8356ffd82935aa63b2aab53ffb49eb0f4004d35964aa files/gmp-4.2.1-ABI-multilib.patch 12390 +AUX gmp-4.2.1-s390.diff 1848 RMD160 04eecb2aaae4c444841e40b33abd38a662254632 SHA1 38ba90ffd6cd9d66e07c5f71b4608e3ad9d32a6b SHA256 13c6b01e71534af2c353d79b7afd171f158b8fa6e3299e0f7c0335e516ce67ec +MD5 ddce691e68e722e03ea65d228ac650ea files/gmp-4.2.1-s390.diff 1848 +RMD160 04eecb2aaae4c444841e40b33abd38a662254632 files/gmp-4.2.1-s390.diff 1848 +SHA256 13c6b01e71534af2c353d79b7afd171f158b8fa6e3299e0f7c0335e516ce67ec files/gmp-4.2.1-s390.diff 1848 DIST gmp-4.2.1.tar.bz2 1726453 RMD160 831e02a36ac7b466857f8fafeffad7d51f7656e7 SHA1 00a97f0ec1eb1d9429ab5c64be6889e8a497425e SHA256 d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941 DIST gmp-man-4.2.1.pdf 996792 RMD160 3f8ea92b95e985d09ed8d5b45952ccf98fbd9dac SHA1 e1f3f84b38d6c459220dbd14015d440cd59195d1 SHA256 3bee6b5285eea339a5ea949cd9db12fe5f676f15beff8ae9cbee0011be24beef -EBUILD gmp-4.2.1-r1.ebuild 1774 RMD160 51d1806dc0142009ce0bec457483f5ca9722880f SHA1 22924a340177d322d555b46120c5a677d2c3a487 SHA256 042ecebb76e57a6389f41aace672324d4563597b9b56cf1518c5d6a7bbfe747a -MD5 31698500f74a98e2c7a5e0e48ec0d0ef gmp-4.2.1-r1.ebuild 1774 -RMD160 51d1806dc0142009ce0bec457483f5ca9722880f gmp-4.2.1-r1.ebuild 1774 -SHA256 042ecebb76e57a6389f41aace672324d4563597b9b56cf1518c5d6a7bbfe747a gmp-4.2.1-r1.ebuild 1774 -MD5 d87bd044c3923c0796531c3bf8576c9f files/digest-gmp-4.2.1-r1 467 -RMD160 98ab335c8f75e99dfd7ddc3d8997efb97f8ef99e files/digest-gmp-4.2.1-r1 467 -SHA256 72f6e7bb87de1a79792e7c22a78d0e16956ec7e0b80a13c7de181b691a627db9 files/digest-gmp-4.2.1-r1 467 +EBUILD gmp-4.2.1-r2.ebuild 2242 RMD160 4f50743d70b5954bf56616dcbbc1f35e25f85cfa SHA1 15ce1c8ad7fa9277858d44a9bedcf40f0f8dd5bc SHA256 db68cdaf5560009f8b758057dd157c115182044210ff5869b2bea9bc5b3d8a2b +MD5 43dfaac4128ccdf2c6b23bd4e9b8e4b9 gmp-4.2.1-r2.ebuild 2242 +RMD160 4f50743d70b5954bf56616dcbbc1f35e25f85cfa gmp-4.2.1-r2.ebuild 2242 +SHA256 db68cdaf5560009f8b758057dd157c115182044210ff5869b2bea9bc5b3d8a2b gmp-4.2.1-r2.ebuild 2242 +MD5 4b5945d6b62e2af3f803f6eb24e3651f files/digest-gmp-4.2.1-r2 405 +RMD160 9a5bddc64cd49298b0e16047e1d0a3a22378dbcf files/digest-gmp-4.2.1-r2 405 +SHA256 7eef51cfe895a21e2cd7412791ab22db2560557177ba436bfbb6c3366ba198b3 files/digest-gmp-4.2.1-r2 405 diff --git a/dev-libs/gmp/files/digest-gmp-4.2.1-r1 b/dev-libs/gmp/files/digest-gmp-4.2.1-r2 index dc6f8c7..abb48e1 100644 --- a/dev-libs/gmp/files/digest-gmp-4.2.1-r1 +++ b/dev-libs/gmp/files/digest-gmp-4.2.1-r2 @@ -1,6 +1,5 @@ MD5 091c56e0e1cca6b09b17b69d47ef18e3 gmp-4.2.1.tar.bz2 1726453 RMD160 831e02a36ac7b466857f8fafeffad7d51f7656e7 gmp-4.2.1.tar.bz2 1726453 SHA256 d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941 gmp-4.2.1.tar.bz2 1726453 -MD5 09ab91ee64673cb78af2a02a310fd15b gmp-man-4.2.1.pdf 996792 RMD160 3f8ea92b95e985d09ed8d5b45952ccf98fbd9dac gmp-man-4.2.1.pdf 996792 SHA256 3bee6b5285eea339a5ea949cd9db12fe5f676f15beff8ae9cbee0011be24beef gmp-man-4.2.1.pdf 996792 diff --git a/dev-libs/gmp/files/gmp-4.2.1-s390.diff b/dev-libs/gmp/files/gmp-4.2.1-s390.diff new file mode 100644 index 0000000..82dbb72 --- /dev/null +++ b/dev-libs/gmp/files/gmp-4.2.1-s390.diff @@ -0,0 +1,68 @@ +stolen from SuSE + +--- configure.in ++++ configure.in +@@ -1050,6 +1050,9 @@ + ;; + + ++ s390x-*-*) ++ path="s390x" ;; ++ + # IBM s/370 and similar + [s3[6-9]0*-*-*]) + gcc_cflags="-O2 $fomit_frame_pointer" +--- configure ++++ configure +@@ -1050,6 +1050,9 @@ + ;; + + ++ s390x-*-*) ++ path="s390x" ;; ++ + # IBM s/370 and similar + s3[6-9]0*-*-*) + gcc_cflags="-O2 $fomit_frame_pointer" +--- mpn/s390/gmp-mparam.h ++++ mpn/s390/gmp-mparam.h +@@ -20,7 +20,8 @@ + MA 02110-1301, USA. */ + + +-/* BITS_PER_MP_LIMB etc generated by configure */ ++#define BITS_PER_MP_LIMB 32 ++#define BYTES_PER_MP_LIMB 4 + + + /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */ +--- mpn/s390x/gmp-mparam.h ++++ mpn/s390x/gmp-mparam.h +@@ -0,0 +1,27 @@ ++/* gmp-mparam.h -- Compiler/machine parameter header file. ++ ++Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc. ++ ++This file is part of the GNU MP Library. ++ ++The GNU MP Library is free software; you can redistribute it and/or modify ++it under the terms of the GNU Library General Public License as published by ++the Free Software Foundation; either version 2 of the License, or (at your ++option) any later version. ++ ++The GNU MP Library is distributed in the hope that it will be useful, but ++WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public ++License for more details. ++ ++You should have received a copy of the GNU Library General Public License ++along with the GNU MP Library; see the file COPYING.LIB. If not, write to ++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ++MA 02111-1307, USA. */ ++ ++#define BITS_PER_MP_LIMB 64 ++#define BYTES_PER_MP_LIMB 8 ++#define BITS_PER_LONGINT 64 ++#define BITS_PER_INT 32 ++#define BITS_PER_SHORTINT 16 ++#define BITS_PER_CHAR 8 diff --git a/dev-libs/gmp/gmp-4.2.1-r1.ebuild b/dev-libs/gmp/gmp-4.2.1-r2.ebuild index 2b6762c..f06e1c8 100644 --- a/dev-libs/gmp/gmp-4.2.1-r1.ebuild +++ b/dev-libs/gmp/gmp-4.2.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2 LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ~ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="doc nocxx" RDEPEND="" @@ -20,12 +20,13 @@ DEPEND="" src_unpack () { unpack ${A} cd "${S}" - local p - for p in x86-fat configure-ppc aix.m4-RW ia64-popcount ; do - epatch "${FILESDIR}"/${PV}/${p}.diff - done + EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV} epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch epatch "${FILESDIR}"/${P}-ABI-multilib.patch + epatch "${FILESDIR}"/${P}-s390.diff + + sed -i -e 's:ABI = @ABI@:GMPABI = @GMPABI@:' \ + Makefile.in */Makefile.in */*/Makefile.in # note: we cannot run autotools here as gcc depends on this package elibtoolize @@ -40,6 +41,17 @@ src_compile() { export CHOST="${CHOST/2.0/1.1}" fi + # ABI mappings (needs all architectures supported) + if [ -n "${ABI}" ]; then + [ "${ABI}" = "32" ] && export GMPABI=32 + [ "${ABI}" = "64" ] && export GMPABI=64 + [ "${ABI}" = "x86" ] && export GMPABI=32 + [ "${ABI}" = "amd64" ] && export GMPABI=64 + [ "${ABI}" = "n64" ] && export GMPABI=64 + [ "${ABI}" = "o32" ] && export GMPABI=o32 + [ "${ABI}" = "n32" ] && export GMPABI=n32 + fi + econf \ --localstatedir=/var/state/gmp \ --disable-mpfr \ @@ -53,12 +65,11 @@ src_compile() { export CHOST="${CHOST/1.1/2.0}" fi - emake || die "emake failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS ChangeLog NEWS README dodoc doc/configuration doc/isa_abi_headache |