summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-11-24 07:06:59 +0000
committerSam James <sam@gentoo.org>2022-11-24 07:20:39 +0000
commit901acc0c32ffdbcd6f7dad926bd7ae215f59f32c (patch)
tree4fb58e7fba83d2292e81b0afc87ef66554de229f /dev-libs/mpfr
parentprofiles/arch/x86: unmask USE=test on dev-java/jmock (diff)
downloadgentoo-901acc0c32ffdbcd6f7dad926bd7ae215f59f32c.tar.gz
gentoo-901acc0c32ffdbcd6f7dad926bd7ae215f59f32c.tar.bz2
gentoo-901acc0c32ffdbcd6f7dad926bd7ae215f59f32c.zip
dev-libs/mpfr: add 4.1.1_p1, drop 4.1.1-r1
Bug: https://bugs.gentoo.org/881995 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/mpfr')
-rw-r--r--dev-libs/mpfr/Manifest1
-rw-r--r--dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch79
-rw-r--r--dev-libs/mpfr/mpfr-4.1.1_p1.ebuild (renamed from dev-libs/mpfr/mpfr-4.1.1-r1.ebuild)1
3 files changed, 1 insertions, 80 deletions
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 98c281833584..979db7ba2241 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -12,4 +12,5 @@ DIST mpfr-4.1.0-patch11.patch 4584 BLAKE2B 4ba240e7e8acc360eb2f05186493fd9044c8f
DIST mpfr-4.1.0-patch12.patch 6768 BLAKE2B 15ce68eb9941ac5d6544ee18a062cb12026e07273a5424b3941596a1024f54cf5481363e145cac9375e518ec2033db82d4fe9152884c74a9037a81fd2c405b5e SHA512 4e91cffa0df911d68931ace13e86e420ec9f7d8e8a0279e12d995bbf8061b6bec90cb03ef8642a854f652907b13e533b7afb95f2279cf2dfa4010ec5d745ac3c
DIST mpfr-4.1.0-patch13.patch 3344 BLAKE2B 1239cf16dfe32a71bb6fc7b156978cd451bcbe4e1b04842fdb3549352a43607d44d58120e38bf448ffd33e36bab7f7cfd4ab65b2eb3aac2fe9bbd86d8f425f5a SHA512 ddd5f54d12584b6e10fd4eba12b8568c5286dba10bd3b5cdd429415b78bc827bd0ed3957bd06ca4c2c63a2f5e877fd9d86eebade8929d61aafe84ace8454d016
DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
+DIST mpfr-4.1.1-patch01.patch 2985 BLAKE2B d6bed1d6fca2319db457096a81aca060c1bd934fcdf9c5f98ba44920a7e97c2a5e9c539ec554feb723fb98c84096e1cb615c0d973133c67f3c2097edc1c5b803 SHA512 aa98173d59a24d0f59acff0c2143db5623746db3f6445e300a018a124b35a6b57d631c357a9a890f23c748591f621a95d3a801bed7341b6c8b6ddcc86ecfb107
DIST mpfr-4.1.1.tar.xz 1429836 BLAKE2B ce20baee2f060acb28b877ffe6fc40c5619cf6af231bd54ca6cfb3e42ef2d74a4ffbab96cf0b5dd6a162e558099a54701d42f34f5bf2256f256fe6f5ae2505d0 SHA512 be468749bd88870dec37be35e544983a8fb7bda638eb9414c37334b9d553099ea2aa067045f51ae2c8ab86d852ef833e18161d173e414af0928e9a438c9b91f1
diff --git a/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch b/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
deleted file mode 100644
index d2521f2fa632..000000000000
--- a/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://bugs.gentoo.org/881995
-https://gitlab.inria.fr/mpfr/mpfr/-/commit/3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6
-https://gitlab.inria.fr/mpfr/mpfr/-/issues/1
-https://github.com/CGAL/cgal/issues/7064
-
-From 3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6 Mon Sep 17 00:00:00 2001
-From: Vincent Lefevre <vincent@vinc17.net>
-Date: Tue, 22 Nov 2022 16:33:00 +0100
-Subject: [PATCH] Fix mpfr_custom_get_kind() macro bug.
-
-* src/mpfr.h: in the mpfr_custom_get_kind() macro, changed mpfr_ptr to
- mpfr_srcptr for _x to agree with the function prototype, in order to
- avoid a compilation failure of user code in some cases. This bug was
- introduced by commit 9f94e0311ed53d0c64d4fbca249d19cc4888027e, which
- introduced the temporary variable _x to avoid an incorrect number of
- evaluations of the x argument.
-* tests/tstckintc.c: improved the tests to detect this bug.
-
-This should fix mpfr bug #1.
-
-Bug initially reported by FX Coudert:
- https://github.com/CGAL/cgal/issues/7064
-
-It affects Fedora Linux:
- https://bugzilla.redhat.com/show_bug.cgi?id=2144197
-
-(cherry picked from commit 0ce17bae34a6c54de31b126f969d3ddd72c6bc37)
---- a/src/mpfr.h
-+++ b/src/mpfr.h
-@@ -1027,7 +1027,7 @@ __MPFR_DECLSPEC int mpfr_total_order_p (mpfr_srcptr, mpfr_srcptr);
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #define mpfr_custom_get_kind(x) \
- __extension__ ({ \
-- mpfr_ptr _x = (x); \
-+ mpfr_srcptr _x = (x); \
- _x->_mpfr_exp > __MPFR_EXP_INF ? \
- (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x) \
- : _x->_mpfr_exp == __MPFR_EXP_INF ? \
---- a/tests/tstckintc.c
-+++ b/tests/tstckintc.c
-@@ -295,14 +295,16 @@ static void
- test_nan_inf_zero (void)
- {
- mpfr_ptr val;
-+ mpfr_srcptr sval; /* for compilation error checking */
- int sign;
- int kind;
-
- reset_stack ();
-
- val = new_mpfr (MPFR_PREC_MIN);
-+ sval = val;
- mpfr_set_nan (val);
-- kind = (mpfr_custom_get_kind) (val);
-+ kind = (mpfr_custom_get_kind) (sval);
- if (kind != MPFR_NAN_KIND)
- {
- printf ("mpfr_custom_get_kind error: ");
-@@ -380,7 +382,8 @@ static long *
- dummy_set_si (long si)
- {
- mpfr_t x;
-- long * r = dummy_new ();
-+ mpfr_srcptr px; /* for compilation error checking */
-+ long *r = dummy_new ();
- int i1, i2, i3, i4, i5;
-
- /* Check that the type "void *" can be used, like with the function.
-@@ -405,7 +408,8 @@ dummy_set_si (long si)
- MPFR_ASSERTN (i5 == 1);
-
- mpfr_set_si (x, si, MPFR_RNDN);
-- r[0] = mpfr_custom_get_kind (x);
-+ px = x;
-+ r[0] = mpfr_custom_get_kind (px);
-
- /* Check that the type "void *" can be used in C, like with the function
- (forbidden in C++). Also check side effects. */
-GitLab
diff --git a/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
index e34c78ab5b44..13392ae4cf60 100644
--- a/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
@@ -47,7 +47,6 @@ PATCHES=(
"${MY_PATCHES[@]}"
# Additional patches
- "${FILESDIR}"/${P}-fix-mpfr_custom_get_kind.patch
)
HTML_DOCS=( doc/FAQ.html )