Attachment 238264 Details for Bug 267896 – Patch for mpfr v2

[patch] Patch for mpfr v2

mpfr411v2.patch (text/plain), 6.68 KB, created by Daniel Engberg on 2022-11-22 22:23:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2022-11-22 22:23:48 UTC

Size: 6.68 KB

patch

obsolete

>diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
>index 78ce08985154..30e6add17045 100644
>--- a/math/mpfr/Makefile
>+++ b/math/mpfr/Makefile
>@@ -1,13 +1,12 @@
> PORTNAME=	mpfr
>-PORTVERSION=	4.1.0
>-PORTREVISION=	1
>+DISTVERSION=	4.1.1
> CATEGORIES=	math devel
>-MASTER_SITES=	https://www.mpfr.org/mpfr-${PORTVERSION}/ \
>-		GNU
>-DIST_SUBDIR=	${DISTNAME}
>+MASTER_SITES=	GNU \
>+		https://www.mpfr.org/mpfr-${DISTVERSION}/
>+DIST_SUBDIR=	${PORTNAME}/${DISTVERSION}
> 
>-PATCH_SITES=	${MASTER_SITES}
>-PATCH_DIST_STRIP=	-p1
>+#PATCH_SITES=	https://www.mpfr.org/mpfr-${DISTVERSION}/
>+#PATCH_DIST_STRIP=	-p1
> 
> MAINTAINER=	ale@FreeBSD.org
> COMMENT=	Library for multiple-precision floating-point computations
>@@ -18,8 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
> 
> LIB_DEPENDS=	libgmp.so:math/gmp
> 
>-PATCHLEVEL=	13
>-PATCHFILES!=	/usr/bin/jot -s " " -w patch%02d ${PATCHLEVEL} 1 ${PATCHLEVEL}
>+#PATCHLEVEL=	1
>+#PATCHFILES!=	/usr/bin/jot -s " " -w patch%02d ${PATCHLEVEL} 1 ${PATCHLEVEL}
> 
> USES=		gmake libtool makeinfo tar:xz
> GNU_CONFIGURE=	yes
>diff --git a/math/mpfr/distinfo b/math/mpfr/distinfo
>index b3f6d945e2a5..8bb8f1e1ce46 100644
>--- a/math/mpfr/distinfo
>+++ b/math/mpfr/distinfo
>@@ -1,29 +1,3 @@
>-TIMESTAMP = 1628251482
>-SHA256 (mpfr-4.1.0/mpfr-4.1.0.tar.xz) = 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
>-SIZE (mpfr-4.1.0/mpfr-4.1.0.tar.xz) = 1525476
>-SHA256 (mpfr-4.1.0/patch01) = a2d9bc87c5642be805eaec5f03f30235f3dd5985bb4edb6917f110b849fa0c40
>-SIZE (mpfr-4.1.0/patch01) = 2061
>-SHA256 (mpfr-4.1.0/patch02) = 20e0ec276d2a091a1154ed000ea19855f26c7190ed01bde745cc84284ae929db
>-SIZE (mpfr-4.1.0/patch02) = 2543
>-SHA256 (mpfr-4.1.0/patch03) = f07903f25dd92ee086f214177870517487f00cb3f2e130db66d252552335b655
>-SIZE (mpfr-4.1.0/patch03) = 9973
>-SHA256 (mpfr-4.1.0/patch04) = 86d0a884a34d94f1ce3537b548f6ca1e027d466914f65165a359b84fe6630926
>-SIZE (mpfr-4.1.0/patch04) = 27336
>-SHA256 (mpfr-4.1.0/patch05) = bc4860ad2a822c2fc08913255882b117a2e9668df9fd21c3ca07633d4ab3a50b
>-SIZE (mpfr-4.1.0/patch05) = 5345
>-SHA256 (mpfr-4.1.0/patch06) = 6dfa09a25a0f7cc553cbfd9cb18de95936ee1234c90f5db7437b8dc4dd5aae24
>-SIZE (mpfr-4.1.0/patch06) = 4026
>-SHA256 (mpfr-4.1.0/patch07) = e65d93a434048f80fa30e2230b47896764abff5757fc4575262270b05bbc457a
>-SIZE (mpfr-4.1.0/patch07) = 3580
>-SHA256 (mpfr-4.1.0/patch08) = b9991564eb2cbdcb419254c2a03729ee5c44dae45ee08f09a6ae5193df6b1f78
>-SIZE (mpfr-4.1.0/patch08) = 4002
>-SHA256 (mpfr-4.1.0/patch09) = e5642c27d91166371da83b05ae4c9d5e8b7f48fff064d16b150d94810b32bc0b
>-SIZE (mpfr-4.1.0/patch09) = 4591
>-SHA256 (mpfr-4.1.0/patch10) = 31a12fe331c779120da5bb3036d57fd86c2a16b6fc66b8a7cae3c5db007d8cae
>-SIZE (mpfr-4.1.0/patch10) = 26493
>-SHA256 (mpfr-4.1.0/patch11) = 37efcec4cfcff50eec27b30a22be7921b6ebc0c3dedc41137d69aba3c1630ea6
>-SIZE (mpfr-4.1.0/patch11) = 4584
>-SHA256 (mpfr-4.1.0/patch12) = 839e7240f30c731a63122c98c1a1a359642fb3fa3dbb07e50f8bb2e1d36c3d29
>-SIZE (mpfr-4.1.0/patch12) = 6768
>-SHA256 (mpfr-4.1.0/patch13) = 4d04d39954df48b2dd6ecbf875c8c143cae3b3362303b5bdb40b643fead2e79b
>-SIZE (mpfr-4.1.0/patch13) = 3344
>+TIMESTAMP = 1668962814
>+SHA256 (mpfr/4.1.1/mpfr-4.1.1.tar.xz) = ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d
>+SIZE (mpfr/4.1.1/mpfr-4.1.1.tar.xz) = 1429836
>diff --git a/math/mpfr/files/patch-git-01-0ce17bae34a6c54de31b126f969d3ddd72c6bc37 b/math/mpfr/files/patch-git-01-0ce17bae34a6c54de31b126f969d3ddd72c6bc37
>new file mode 100644
>index 000000000000..beb014211ee9
>--- /dev/null
>+++ b/math/mpfr/files/patch-git-01-0ce17bae34a6c54de31b126f969d3ddd72c6bc37
>@@ -0,0 +1,83 @@
>+From 0ce17bae34a6c54de31b126f969d3ddd72c6bc37 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
>+---
>+ src/mpfr.h        |  2 +-
>+ tests/tstckintc.c | 10 +++++++---
>+ 2 files changed, 8 insertions(+), 4 deletions(-)
>+
>+diff --git a/src/mpfr.h b/src/mpfr.h
>+index 8c8bc08d9..44d9329e3 100644
>+--- src/mpfr.h
>++++ src/mpfr.h
>+@@ -1064,7 +1064,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 ?                               \
>+diff --git a/tests/tstckintc.c b/tests/tstckintc.c
>+index e95e81ef9..a0c4486fb 100644
>+--- tests/tstckintc.c
>++++ 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/math/mpfr/pkg-plist b/math/mpfr/pkg-plist
>index 5354c30c8829..ed0b3223297d 100644
>--- a/math/mpfr/pkg-plist
>+++ b/math/mpfr/pkg-plist
>@@ -3,5 +3,5 @@ include/mpf2mpfr.h
> lib/libmpfr.a
> lib/libmpfr.so
> lib/libmpfr.so.6
>-lib/libmpfr.so.6.1.0
>+lib/libmpfr.so.6.1.1
> libdata/pkgconfig/mpfr.pc

Actions: View | Diff

Attachments on bug 267896: 238221 | 238264