diff --git a/build/pkgs/linbox/checksums.ini b/build/pkgs/linbox/checksums.ini index 23f1a33a68f..397bf97190f 100644 --- a/build/pkgs/linbox/checksums.ini +++ b/build/pkgs/linbox/checksums.ini @@ -1,4 +1,5 @@ tarball=linbox-VERSION.tar.gz -sha1=9268e21b5aecbbfc45204b25195b786f80b769bc -md5=1e90e300c7a324a7b6cece7c605b7a4e -cksum=1921179523 +sha1=24e8bdbd16fe3dedce0dd343398999a4aed7c02c +md5=1e1b95f12f015815a0194eac0cb611d0 +cksum=253115750 +upstream_url=https://github.com/linbox-team/linbox/releases/download/vVERSION/linbox-VERSION.tar.gz \ No newline at end of file diff --git a/build/pkgs/linbox/package-version.txt b/build/pkgs/linbox/package-version.txt index 8ecda4f1393..bd8bf882d06 100644 --- a/build/pkgs/linbox/package-version.txt +++ b/build/pkgs/linbox/package-version.txt @@ -1 +1 @@ -1.6.3.p1 +1.7.0 diff --git a/build/pkgs/linbox/patches/292.patch b/build/pkgs/linbox/patches/292.patch new file mode 100644 index 00000000000..d3333cc23d0 --- /dev/null +++ b/build/pkgs/linbox/patches/292.patch @@ -0,0 +1,24 @@ +From 49b9cccd0286980c1c1811c3b03df883ef0164df Mon Sep 17 00:00:00 2001 +From: Doug Torrance +Date: Tue, 14 Dec 2021 16:22:33 -0500 +Subject: [PATCH] Only register uint128_t as a TypeName when it's available. + +Otherwise, test-fft will fail when it isn't. +--- + tests/test-fft.C | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/test-fft.C b/tests/test-fft.C +index d19184c2d..5811ebc5d 100644 +--- a/tests/test-fft.C ++++ b/tests/test-fft.C +@@ -55,7 +55,9 @@ REGISTER_TYPE_NAME(double); + REGISTER_TYPE_NAME(uint16_t); + REGISTER_TYPE_NAME(uint32_t); + REGISTER_TYPE_NAME(uint64_t); ++#ifdef __FFLASFFPACK_HAVE_INT128 + REGISTER_TYPE_NAME(uint128_t); ++#endif + REGISTER_TYPE_NAME(Modular); + REGISTER_TYPE_NAME(ModularExtended); + diff --git a/build/pkgs/linbox/patches/294.patch b/build/pkgs/linbox/patches/294.patch new file mode 100644 index 00000000000..7c645f165d3 --- /dev/null +++ b/build/pkgs/linbox/patches/294.patch @@ -0,0 +1,38 @@ +From f81a1f4a5e0835b7a0f3bb88a0fcbbaa32174cfa Mon Sep 17 00:00:00 2001 +From: Cyril Bouvier +Date: Wed, 15 Dec 2021 16:00:39 +0100 +Subject: [PATCH] Only register uint128_t as a TypeName when it's available + +--- + benchmarks/benchmark-fft.C | 2 ++ + benchmarks/benchmark-polynomial-matrix-mul-fft.C | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/benchmarks/benchmark-fft.C b/benchmarks/benchmark-fft.C +index 39b86c9d9..59a8be57c 100644 +--- a/benchmarks/benchmark-fft.C ++++ b/benchmarks/benchmark-fft.C +@@ -54,7 +54,9 @@ REGISTER_TYPE_NAME(double); + REGISTER_TYPE_NAME(uint16_t); + REGISTER_TYPE_NAME(uint32_t); + REGISTER_TYPE_NAME(uint64_t); ++#ifdef __FFLASFFPACK_HAVE_INT128 + REGISTER_TYPE_NAME(uint128_t); ++#endif + REGISTER_TYPE_NAME(Modular); + REGISTER_TYPE_NAME(ModularExtended); + +diff --git a/benchmarks/benchmark-polynomial-matrix-mul-fft.C b/benchmarks/benchmark-polynomial-matrix-mul-fft.C +index e9b184bcf..7bf17f33e 100644 +--- a/benchmarks/benchmark-polynomial-matrix-mul-fft.C ++++ b/benchmarks/benchmark-polynomial-matrix-mul-fft.C +@@ -65,7 +65,9 @@ REGISTER_TYPE_NAME(double); + REGISTER_TYPE_NAME(uint16_t); + REGISTER_TYPE_NAME(uint32_t); + REGISTER_TYPE_NAME(uint64_t); ++#ifdef __FFLASFFPACK_HAVE_INT128 + REGISTER_TYPE_NAME(uint128_t); ++#endif + REGISTER_TYPE_NAME(Modular); + REGISTER_TYPE_NAME(ModularExtended); + diff --git a/build/pkgs/linbox/patches/fix-ksh-pkgconfig.patch b/build/pkgs/linbox/patches/fix-ksh-pkgconfig.patch deleted file mode 100644 index e0cb575b1a1..00000000000 --- a/build/pkgs/linbox/patches/fix-ksh-pkgconfig.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 52c78df67a08de074991a93b57946b7bd5ea7196 Mon Sep 17 00:00:00 2001 -From: Dima Pasechnik -Date: Fri, 8 May 2020 15:53:25 +0100 -Subject: [PATCH 1/1] remove redundant 1st and last lines - -they remain if the script is run under ksh, leading to broken .pc file ---- - linbox.pc.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/linbox.pc.in b/linbox.pc.in -index f54285e..eb6835b 100644 ---- a/linbox.pc.in -+++ b/linbox.pc.in -@@ -1,4 +1,3 @@ --/------------------ linbox.pc ------------------------ - prefix=@prefix@ - exec_prefix=@prefix@ - libdir=@libdir@ -@@ -11,4 +10,4 @@ Version: @VERSION@ - Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0 - Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ - Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@ @IML_CFLAGS@ @FLINT_CFLAGS@ --\------------------------------------------------------- -+ --- -2.26.2 - diff --git a/build/pkgs/linbox/patches/linbox-pr-256.patch b/build/pkgs/linbox/patches/linbox-pr-256.patch deleted file mode 100644 index 9ca03791d30..00000000000 --- a/build/pkgs/linbox/patches/linbox-pr-256.patch +++ /dev/null @@ -1,47 +0,0 @@ -Extracted from the following patch: - -From 27811e0021c73de26bf2cff5105c763e163ca8b7 Mon Sep 17 00:00:00 2001 -From: Jean-Guillaume Dumas -Date: Fri, 26 Jun 2020 09:54:38 +0200 -Subject: [PATCH 1/3] iterators may have different types - ---- - linbox/vector/blas-subvector.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -From 4ff828e20053ab2ef9adc4ce6931d159fd513cef Mon Sep 17 00:00:00 2001 -From: Jean-Guillaume Dumas -Date: Fri, 26 Jun 2020 09:54:57 +0200 -Subject: [PATCH 2/3] incompatible const & with modifiers - ---- - examples/Makefile.am | 3 +- - examples/ratdet.C | 96 ++++++++++++++++++++++++++++++++ - linbox/algorithms/det-rational.h | 4 +- - 3 files changed, 100 insertions(+), 3 deletions(-) - create mode 100644 examples/ratdet.C - -diff --git a/linbox/algorithms/det-rational.h b/linbox/algorithms/det-rational.h -index 327b4710f..1943876c1 100644 ---- a/linbox/algorithms/det-rational.h -+++ b/linbox/algorithms/det-rational.h -@@ -79,8 +79,8 @@ namespace LinBox - struct MyRationalModularDet { - const Blackbox &A; - const MyMethod &M; -- const Integer &mul;//multiplicative prec; -- const Integer ÷ -+ Integer mul;//multiplicative prec; -+ Integer div; - - MyRationalModularDet(const Blackbox& b, const MyMethod& n, - const Integer & p1, const Integer & p2) : - -From 567f727aa42de6678433591d731b275ea55fa8ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20Pernet?= -Date: Fri, 26 Jun 2020 17:11:37 +0200 -Subject: [PATCH 3/3] untabify + auto-indent - ---- - examples/ratdet.C | 66 +++++++++++++++++++++++------------------------ - 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/build/pkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch b/build/pkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch deleted file mode 100644 index c93915fb1b0..00000000000 --- a/build/pkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch +++ /dev/null @@ -1,23 +0,0 @@ -Backported from: - -From 426eb97ba762c7663884f57ead0909f2aa3cd6a5 Mon Sep 17 00:00:00 2001 -From: Cyril Bouvier -Date: Thu, 17 Jan 2019 16:32:19 +0100 -Subject: [PATCH] Remove @LINBOXSAGE_LIBS@ from linbox.pc.in - ---- - linbox.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linbox.pc.in b/linbox.pc.in -index 278f127e4..c6b8091eb 100644 ---- a/linbox.pc.in -+++ b/linbox.pc.in -@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library - URL: http://github.com/linbox-team/linbox - Version: @VERSION@ - Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0 --Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ -+Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ - Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@ @IML_CFLAGS@ @FLINT_CFLAGS@ - \-------------------------------------------------------