diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-06-08 13:01:16 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-10 23:03:41 +0200 |
| commit | 417eaa88dc8bac3e0e0f7f74d1782629f5eb2150 (patch) | |
| tree | b09ad3a5ee807e9696c6e0f70780beebfe5d240e /gnu/packages | |
| parent | d7c8bcc47cd399d6825159de5c2c056ad01f4965 (diff) | |
| download | guix-417eaa88dc8bac3e0e0f7f74d1782629f5eb2150.tar guix-417eaa88dc8bac3e0e0f7f74d1782629f5eb2150.tar.gz | |
gnu: arb: Build with flint 2.6.
Backport an upstream patch to fix a compatibility issue with flint 2.6.
* gnu/packages/algebra.scm (arb): Add patch.
* gnu/packages/patches/arb-flint-2.6.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register new file.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/algebra.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/arb-flint-2.6.patch | 48 |
2 files changed, 50 insertions, 1 deletions
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 048c31d017..9041178d21 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -504,7 +504,8 @@ fast arithmetic.") (file-name (git-file-name name version)) (sha256 (base32 - "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")))) + "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")) + (patches (search-patches "arb-flint-2.6.patch")))) (build-system gnu-build-system) (propagated-inputs `(("flint" ,flint))) ; flint.h is included by arf.h diff --git a/gnu/packages/patches/arb-flint-2.6.patch b/gnu/packages/patches/arb-flint-2.6.patch new file mode 100644 index 0000000000..98ff5e95b4 --- /dev/null +++ b/gnu/packages/patches/arb-flint-2.6.patch @@ -0,0 +1,48 @@ +From d3d9983231e0f034e86a1e75761627eb8213b704 Mon Sep 17 00:00:00 2001 +From: fredrik <fredrik.johansson@gmail.com> +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) + { |