diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-08-25 19:33:46 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-08-25 19:33:46 +0000 |
commit | 5b0fbac555731262460688f0a160553ea0521398 (patch) | |
tree | fdbd0e3446950a13c11de5080e40a90f9bed89bf /dev-libs/gmp | |
parent | add libtool dependency - bug #380265 (diff) | |
download | historical-5b0fbac555731262460688f0a160553ea0521398.tar.gz historical-5b0fbac555731262460688f0a160553ea0521398.tar.bz2 historical-5b0fbac555731262460688f0a160553ea0521398.zip |
Add fix from upstream, add USE=static-libs support #378233 by Agostino Sarubbo, restore USE=doc support, and trim .la files as needed.
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/gmp')
-rw-r--r-- | dev-libs/gmp/ChangeLog | 9 | ||||
-rw-r--r-- | dev-libs/gmp/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch | 21 | ||||
-rw-r--r-- | dev-libs/gmp/gmp-5.0.2_p1.ebuild | 98 |
4 files changed, 131 insertions, 2 deletions
diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog index 9af9b68292fc..4405f4c858cf 100644 --- a/dev-libs/gmp/ChangeLog +++ b/dev-libs/gmp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/gmp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.142 2011/08/05 15:27:23 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.143 2011/08/25 19:33:46 vapier Exp $ + +*gmp-5.0.2_p1 (25 Aug 2011) + + 25 Aug 2011; Mike Frysinger <vapier@gentoo.org> +gmp-5.0.2_p1.ebuild, + +files/gmp-5.0.2-unnormalised-dividends.patch: + Add fix from upstream, add USE=static-libs support #378233 by Agostino + Sarubbo, restore USE=doc support, and trim .la files as needed. 05 Aug 2011; Jeremy Olexa <darkside@gentoo.org> gmp-4.3.2.ebuild, gmp-5.0.1.ebuild, gmp-5.0.2.ebuild: diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest index 77ba09572121..1685fd83e36f 100644 --- a/dev-libs/gmp/Manifest +++ b/dev-libs/gmp/Manifest @@ -4,11 +4,14 @@ AUX gmp-4.3.2-ABI-multilib.patch 8883 RMD160 e6a41f288643af4a518ecc19ca5b04eb7f5 AUX gmp-5.0.0-s390.diff 1839 RMD160 2b83f296906a7a15add19b126f73059571b8880e SHA1 f5ca3a792c89384d3e7dd5ff36041b5d679ed76f SHA256 e4ca88304a072ad29387ad7893efc28ee2ce600dfe020f35f80e939c83c31b0c AUX gmp-5.0.1-perfpow-test.patch 1071 RMD160 1af4778602a55cda15763687329348c5ebd6f2fb SHA1 3f3ecf0b97d6b70e36bd0179f45b436e7c41d7e5 SHA256 a2fec6646f36d49dbeda9a520d682a26e560d1c3a5f78f3537d1889a71eb8e1f AUX gmp-5.0.1-x86-nopie-tests.patch 3798 RMD160 2086849c394e35753ca84a464ac9e0c32165fd23 SHA1 97a0ce472b36754ecdd5416bd7c5a2aad4766087 SHA256 3f108ece1cf1f18afd8a36f2b9f03eeb32afa9c4937c707bce840bd62824a61a +AUX gmp-5.0.2-unnormalised-dividends.patch 682 RMD160 feb31d040fdfedf4212e86676be92b2adf852c76 SHA1 81ca793feccb31e322d0791a4946f79c4b7c8e92 SHA256 6d7c4f4d9eaba14ac6d3364f26e849963be3149727cbfe5ee64cc588587dd8c5 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 +DIST gmp-man-5.0.2.pdf 1024222 RMD160 8b109ab46248d2cc3eaa383a10921558c6eb657f SHA1 bccd7089b9a355c102770ce98534d581af8a1a42 SHA256 fcdd621dea0215b8920bdbfacf374ae8ef4f548a2d0c3e8d65d904f1b9d174d4 EBUILD gmp-4.3.2.ebuild 2002 RMD160 666c9fd2eacede528cf09c36c8dd633599c7524b SHA1 6e0f252c5dfa87a60e62afe7d4e4723c9a765b8f SHA256 71b4106595a6a46703f3a50de06b9d5fe72bb3b49277ca23527fdc7c07faa8a1 EBUILD gmp-5.0.1.ebuild 2481 RMD160 78af7381019b8ac77c7718d6181a3c190984df6f SHA1 5825c088f861b077631cd1666e83abb5c4dd14b0 SHA256 f792bd1e85b4d0d45d79dc98487ed74b0e9e499cb981aececc4cb3c86a623e0c EBUILD gmp-5.0.2.ebuild 2435 RMD160 7c959b13094fd0db3d14cc73c93f8dd83b0d5db3 SHA1 1ce8f39ac2ec7bf49aa321405e31cefa71a65473 SHA256 3a1896b6d336fe9bc4d5b488b7861a504eb115f6eb587bc712b88d986be7ce61 -MISC ChangeLog 18975 RMD160 fdeef9bbca1cfc07979ab23e3a99d702d6abef3c SHA1 3dbca0db2983a442368f5c6f331ed5ceef1b3724 SHA256 fce7694bcf7b6222afe0e924426b4d523e62367de8876e6d4bc8a2f07e346725 +EBUILD gmp-5.0.2_p1.ebuild 2727 RMD160 5f64687b90a0fa7b11b7a776c340dd69a9078df3 SHA1 8c0c2d339d101c256516acc7cd6b97a011203580 SHA256 3a010d38c7c02acca52d6e24519b54f473f5f41720756a1ce7212e031b56c1c9 +MISC ChangeLog 19263 RMD160 a40b15a208184dd1cd8729936974ede41f92993c SHA1 0577857d3ac43b6650c9f3c7d5a0f3a02612e7e5 SHA256 19385276e3f2499cef93e8f9bb512e8e6afb89f2c951f748c5a5a7eaff3dd28c MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a diff --git a/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch b/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch new file mode 100644 index 000000000000..f29f2eca1a90 --- /dev/null +++ b/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch @@ -0,0 +1,21 @@ + +# HG changeset patch +# User Torbjorn Granlund <tege@gmplib.org> +# Date 1310730221 -7200 +# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 +# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 +(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. + +diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c +--- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 ++++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 +@@ -130,7 +129,7 @@ + qn = nn - qn; + while (qn > dn) + { +- mpn_sub_1 (np + dn, np + dn, qn, cy); ++ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); + cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); + qp += dn; + np += dn; + diff --git a/dev-libs/gmp/gmp-5.0.2_p1.ebuild b/dev-libs/gmp/gmp-5.0.2_p1.ebuild new file mode 100644 index 000000000000..ca0d8202d78f --- /dev/null +++ b/dev-libs/gmp/gmp-5.0.2_p1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.2_p1.ebuild,v 1.1 2011/08/25 19:33:46 vapier Exp $ + +inherit flag-o-matic eutils libtool flag-o-matic toolchain-funcs + +MY_PV=${PV/_p*} +MY_P=${PN}-${MY_PV} +PLEVEL=${PV/*p} +DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers" +HOMEPAGE="http://gmplib.org/" +SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.bz2 + doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="doc nocxx static-libs" + +DEPEND="sys-devel/m4" +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.bz2 + 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.0-s390.diff + epatch "${FILESDIR}"/${MY_P}-unnormalised-dividends.patch + + # disable -fPIE -pie in the tests for x86 #236054 + if use x86 && gcc-specs-pie ; then + epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch + fi + + # note: we cannot run autotools here as gcc depends on this package + elibtoolize + + # GMP uses the "ABI" env var during configure as does Gentoo (econf). + # So, to avoid patching the source constantly, wrap things up. + mv configure configure.wrapped || die + cat <<-\EOF > configure + #!/bin/sh + exec env ABI="$GMPABI" "${0}.wrapped" "$@" + EOF + chmod a+rx configure +} + +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;; + 64|amd64|n64) GMPABI=64;; + o32|n32) GMPABI=${ABI};; + esac + export GMPABI + + tc-export CC + econf \ + --localstatedir=/var/state/gmp \ + --disable-mpbsd \ + $(use_enable !nocxx cxx) \ + $(use_enable static-libs static) \ + || die + + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + # should be a standalone lib + rm -f "${D}"/usr/$(get_libdir)/libgmp.la + # this requires libgmp + use static-libs || rm -f "${D}"/usr/$(get_libdir)/libgmpxx.la + + dodoc AUTHORS ChangeLog NEWS README + dodoc doc/configuration doc/isa_abi_headache + dohtml -r doc + + use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/ +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libgmp.so.3 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3 +} |