diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/mpc | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/mpc')
-rw-r--r-- | dev-libs/mpc/Manifest | 8 | ||||
-rw-r--r-- | dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch | 129 | ||||
-rw-r--r-- | dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch | 25 | ||||
-rw-r--r-- | dev-libs/mpc/metadata.xml | 8 | ||||
-rw-r--r-- | dev-libs/mpc/mpc-1.0.3-r2.ebuild | 39 | ||||
-rw-r--r-- | dev-libs/mpc/mpc-1.0.3.ebuild | 33 | ||||
-rw-r--r-- | dev-libs/mpc/mpc-1.1.0-r1.ebuild | 28 |
7 files changed, 270 insertions, 0 deletions
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest new file mode 100644 index 000000000000..ba76f8a2d1c1 --- /dev/null +++ b/dev-libs/mpc/Manifest @@ -0,0 +1,8 @@ +AUX mpc-1.0.3-mpfr-4.0.0.patch 3748 BLAKE2B 906ee3ff90ab1d9aad58caae7b1185d99d6e09f30f9fe80e9673c0ef499b4fff349b61c6de77502e2e3eecc68ecab6d00453cf1525cb8b404a6f7be9b90ec3b5 SHA512 7ecdc20adce8d71c268e7b090a484441f2b807c19caef637de0bd97cdc12534d7b24f6d7cae80e3c1ecbf7c6445f81cb63b219869797e69de3dbae0e268d9caa +AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6 +DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43 +DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628 +EBUILD mpc-1.0.3-r2.ebuild 1105 BLAKE2B dc62c597630b6de0c870eff40e6322b75af258926185a296f55353976c3cfa2ff3f4d189f97001de02c1e4b1665f808c1d3944846abe5839775a0aac7bc0f72e SHA512 73fc04828fdf561b94d830a3b2604bccd53e8ef0669a4af28ca8402e797c8eff2e851074874142f1ea23aebbd7def75b4b03b26ff75456d84d368922b7386ec7 +EBUILD mpc-1.0.3.ebuild 1015 BLAKE2B afd85b4bcbfebbdea5b2fd505552f81d2b58e1e639fcc6f0eb3f8d88a1235c35fa04151a4f8d7ee4499e77fad87be3b9f63b5ee738af139fdeb95f488d76cb42 SHA512 f0451c7c73564ac34d08a6de5c985c1c34eea2a7a5e44617ee6304fcebe9899ff7f46072685edee15a1e3c75b1f4beff273a871b3109ea77e35072405daa2aab +EBUILD mpc-1.1.0-r1.ebuild 953 BLAKE2B 8a96c5856edaf54eab23ad5625164636c818b53a0bb66155d8c0fe99b280942d8421fdbafdc988764dbbc03d93b34665ce61d69f6cbe29c113e4abefd787fcfc SHA512 c4435f9c47e4b2c2165fd380b749cfb02ecfb77ddd17fe51afd46e9d8ada086b29f92ead62481327b0a5baca60380bf7b2f57b609b6561ace4ab5ccba535bdfa +MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c diff --git a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch new file mode 100644 index 000000000000..3a62d9bd20a3 --- /dev/null +++ b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch @@ -0,0 +1,129 @@ +https://bugs.gentoo.org/642300 + +From 36a84f43f326de14db888ba07936cc9621c23f19 Mon Sep 17 00:00:00 2001 +From: Paul Zimmermann <Paul.Zimmermann@inria.fr> +Date: Sun, 10 Jan 2016 23:19:37 +0100 +Subject: [PATCH] use mpfr_fmma and mpfr_fmms if provided by mpfr + +--- + configure.ac | 16 ++++++++++++++++ + src/mul.c | 15 ++++++++++++--- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b6fa199..bdb21ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -165,6 +165,22 @@ AC_LINK_IFELSE( + AC_MSG_ERROR([libmpfr not found or uses a different ABI (including static vs shared).]) + ]) + ++AC_MSG_CHECKING(for mpfr_fmma) ++LIBS="-lmpfr $LIBS" ++AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include "mpfr.h"]], ++ [[mpfr_t x; mpfr_fmma (x, x, x, x, x, 0);]] ++ )], ++ [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_MPFR_FMMA, 1, [mpfr_fmma is present]) ++ ], ++ [ ++ AC_MSG_RESULT(no) ++ AC_DEFINE(HAVE_MPFR_FMMA, 0, [mpfr_fmma is not present]) ++ ]) ++ + # Check for a recent GMP + # We only guarantee that with a *functional* and recent enough GMP version, + # MPC will compile; we do not guarantee that GMP will compile. +diff --git a/src/mul.c b/src/mul.c +index 3c9c0a7..8c4afe4 100644 +--- a/src/mul.c ++++ b/src/mul.c +@@ -171,8 +171,9 @@ + } + + ++#if HAVE_MPFR_FMMA == 0 + static int +-mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, ++mpc_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, + mpfr_srcptr d, int sign, mpfr_rnd_t rnd) + { + /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0. +@@ -319,6 +320,7 @@ + + return inex; + } ++#endif + + + int +@@ -337,10 +339,17 @@ + else + rop [0] = z [0]; + +- inex = MPC_INEX (mpfr_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), +- mpc_imagref (y), -1, MPC_RND_RE (rnd)), ++#if HAVE_MPFR_FMMA ++ inex = MPC_INEX (mpfr_fmms (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), ++ mpc_imagref (y), MPC_RND_RE (rnd)), + mpfr_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), ++ mpc_realref (y), MPC_RND_IM (rnd))); ++#else ++ inex = MPC_INEX (mpc_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), ++ mpc_imagref (y), -1, MPC_RND_RE (rnd)), ++ mpc_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), + mpc_realref (y), +1, MPC_RND_IM (rnd))); ++#endif + + mpc_set (z, rop, MPC_RNDNN); + if (overlap) +--- a/configure ++++ b/configure +@@ -13835,6 +13835,41 @@ else + $as_echo "no" >&6; } + as_fn_error $? "libmpfr not found or uses a different ABI (including static vs shared)." "$LINENO" 5 + ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpfr_fmma" >&5 ++$as_echo_n "checking for mpfr_fmma... " >&6; } ++LIBS="-lmpfr $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include "mpfr.h" ++int ++main () ++{ ++mpfr_t x; mpfr_fmma (x, x, x, x, x, 0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++$as_echo "#define HAVE_MPFR_FMMA 1" >>confdefs.h ++ ++ ++else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++$as_echo "#define HAVE_MPFR_FMMA 0" >>confdefs.h ++ ++ + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-- +2.15.1 + diff --git a/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch b/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch new file mode 100644 index 000000000000..445e94191030 --- /dev/null +++ b/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch @@ -0,0 +1,25 @@ +mpfr-4.0.0 removed 'mpfr_add_one_ulp' and 'mpfr_sub_one_ulp' + +From 5eaa17651b759c7856a118835802fecbebcf46ad Mon Sep 17 00:00:00 2001 +From: Paul Zimmermann <Paul.Zimmermann@inria.fr> +Date: Wed, 4 Oct 2017 22:09:40 +0200 +Subject: [PATCH] replace obsolete mpfr_add_one_ulp/mpfr_sub_one_ulp functions + +--- + src/mpc-impl.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/mpc-impl.h b/src/mpc-impl.h +index 4026765..5420691 100644 +--- a/src/mpc-impl.h ++++ b/src/mpc-impl.h +@@ -60,2 +60,4 @@ along with this program. If not, see http://www.gnu.org/licenses/ . +-#define MPFR_ADD_ONE_ULP(x) mpfr_add_one_ulp (x, GMP_RNDN) +-#define MPFR_SUB_ONE_ULP(x) mpfr_sub_one_ulp (x, GMP_RNDN) ++#define MPFR_ADD_ONE_ULP(x) \ ++ (mpfr_sgn (x) > 0 ? mpfr_nextabove (x) : mpfr_nextbelow (x)) ++#define MPFR_SUB_ONE_ULP(x) \ ++ (mpfr_sgn (x) > 0 ? mpfr_nextbelow (x) : mpfr_nextabove (x)) +-- +2.15.1 + diff --git a/dev-libs/mpc/metadata.xml b/dev-libs/mpc/metadata.xml new file mode 100644 index 000000000000..67bd6a97db11 --- /dev/null +++ b/dev-libs/mpc/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> + </maintainer> +</pkgmetadata> diff --git a/dev-libs/mpc/mpc-1.0.3-r2.ebuild b/dev-libs/mpc/mpc-1.0.3-r2.ebuild new file mode 100644 index 000000000000..341a5f65ce14 --- /dev/null +++ b/dev-libs/mpc/mpc-1.0.3-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils libtool multilib-minimal + +DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" +HOMEPAGE="http://mpc.multiprecision.org/" +SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/mpfr-2.4.2:0=[${MULTILIB_USEDEP},static-libs?]" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-mpfr-4.0.0.patch + "${FILESDIR}"/${P}-no-ulp.patch +) + +src_prepare() { + default + + elibtoolize #347317 +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild new file mode 100644 index 000000000000..cabde2f027f2 --- /dev/null +++ b/dev-libs/mpc/mpc-1.0.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +inherit eutils libtool multilib-minimal + +DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" +HOMEPAGE="http://mpc.multiprecision.org/" +SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/mpfr-2.4.2[${MULTILIB_USEDEP},static-libs?] + <dev-libs/mpfr-4.0.0" +RDEPEND="${DEPEND}" + +src_prepare() { + elibtoolize #347317 +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild new file mode 100644 index 000000000000..745967b5ccbd --- /dev/null +++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib-minimal + +DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" +HOMEPAGE="http://mpc.multiprecision.org/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/mpfr-3.0.0:0=[${MULTILIB_USEDEP},static-libs?]" +RDEPEND="${DEPEND}" + +multilib_src_configure() { + ECONF_SOURCE=${S} econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} |