From 62fee73d2e3c0fb9b533db1163ef1746d870f854 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 14 Jun 2020 14:56:41 -0700 Subject: [PATCH] build/pkgs/arb/patches/[flint.. silence-stderr-exponent-too-large].patch: Remove --- build/pkgs/arb/patches/flint26comp.patch | 48 ------------------- .../silence-stderr-exponent-too-large.patch | 37 -------------- 2 files changed, 85 deletions(-) delete mode 100644 build/pkgs/arb/patches/flint26comp.patch delete mode 100644 build/pkgs/arb/patches/silence-stderr-exponent-too-large.patch diff --git a/build/pkgs/arb/patches/flint26comp.patch b/build/pkgs/arb/patches/flint26comp.patch deleted file mode 100644 index 98ff5e95b40..00000000000 --- a/build/pkgs/arb/patches/flint26comp.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d3d9983231e0f034e86a1e75761627eb8213b704 Mon Sep 17 00:00:00 2001 -From: fredrik -Date: Wed, 29 Apr 2020 13:41:36 +0200 -Subject: [PATCH] handle flint incompatibilities - ---- - fmpr.h | 4 ++++ - fmpz_extras.h | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/fmpr.h b/fmpr.h -index 2204d72e..c6a8c342 100644 ---- a/fmpr.h -+++ b/fmpr.h -@@ -22,7 +22,11 @@ - #include "flint/flint.h" - #include "flint/fmpz.h" - #include "flint/fmpq.h" -+#if __FLINT_RELEASE < 20600 - #include "flint/config.h" -+#else -+#include "flint/flint-config.h" -+#endif - #include "fmpz_extras.h" - - #ifndef flint_abort -diff --git a/fmpz_extras.h b/fmpz_extras.h -index 4fd0538f..486e28c8 100644 ---- a/fmpz_extras.h -+++ b/fmpz_extras.h -@@ -43,6 +43,8 @@ fmpz_add_inline(fmpz_t z, const fmpz_t x, const fmpz_t y) - fmpz_add(z, x, y); - } - -+#if __FLINT_RELEASE < 20600 -+ - static __inline__ void - fmpz_add_si(fmpz_t z, const fmpz_t x, slong y) - { -@@ -61,6 +63,8 @@ fmpz_sub_si(fmpz_t z, const fmpz_t x, slong y) - fmpz_add_ui(z, x, -y); - } - -+#endif -+ - static __inline__ void - fmpz_add_si_inline(fmpz_t z, const fmpz_t x, slong y) - { diff --git a/build/pkgs/arb/patches/silence-stderr-exponent-too-large.patch b/build/pkgs/arb/patches/silence-stderr-exponent-too-large.patch deleted file mode 100644 index dbc608955c4..00000000000 --- a/build/pkgs/arb/patches/silence-stderr-exponent-too-large.patch +++ /dev/null @@ -1,37 +0,0 @@ -Do not write stuff to stderr when signalling errors - -See https://trac.sagemath.org/ticket/28817 - - -diff --git a/arf/get_mpfr.c b/arf/get_mpfr.c -index 34012af..9ccb87b 100644 ---- a/arf/get_mpfr.c -+++ b/arf/get_mpfr.c -@@ -30,7 +30,6 @@ arf_get_mpfr(mpfr_t x, const arf_t y, mpfr_rnd_t rnd) - } - else if (COEFF_IS_MPZ(*ARF_EXPREF(y))) - { -- flint_printf("exception: exponent too large to convert to mpfr"); - flint_abort(); - r = 0; /* dummy return because flint_abort() is not declared noreturn */ - } -diff --git a/fmpr/get_mpfr.c b/fmpr/get_mpfr.c -index 63b6682..e2dda3b 100644 ---- a/fmpr/get_mpfr.c -+++ b/fmpr/get_mpfr.c -@@ -25,7 +25,6 @@ fmpr_get_mpfr(mpfr_t x, const fmpr_t y, mpfr_rnd_t rnd) - } - else if (COEFF_IS_MPZ(*fmpr_expref(y))) - { -- flint_printf("exception: exponent too large to convert to mpfr"); - flint_abort(); - r = 0; /* dummy return because flint_abort() is not declared noreturn */ - } -@@ -42,7 +41,6 @@ fmpr_get_mpfr(mpfr_t x, const fmpr_t y, mpfr_rnd_t rnd) - - if (!mpfr_regular_p(x)) - { -- flint_printf("exception: exponent too large to convert to mpfr"); - flint_abort(); - } - }