From 478099902bc5eb6ad34614b4f12bb3d464cb38e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 16 Dec 2021 20:20:20 -0300 Subject: [PATCH] linbox: update to 1.7.0. --- srcpkgs/linbox/patches/292.patch | 24 ++++++++++++ srcpkgs/linbox/patches/294.patch | 38 +++++++++++++++++++ ...8adade10641f1f04f04b589753d928fb5443.patch | 35 ----------------- .../remove-linboxsage-libs-from-pc.patch | 23 ----------- srcpkgs/linbox/template | 11 +++--- 5 files changed, 67 insertions(+), 64 deletions(-) create mode 100644 srcpkgs/linbox/patches/292.patch create mode 100644 srcpkgs/linbox/patches/294.patch delete mode 100644 srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch delete mode 100644 srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch diff --git a/srcpkgs/linbox/patches/292.patch b/srcpkgs/linbox/patches/292.patch new file mode 100644 index 00000000000..d3333cc23d0 --- /dev/null +++ b/srcpkgs/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/srcpkgs/linbox/patches/294.patch b/srcpkgs/linbox/patches/294.patch new file mode 100644 index 00000000000..7c645f165d3 --- /dev/null +++ b/srcpkgs/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/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch b/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch deleted file mode 100644 index 5afa078ec7b..00000000000 --- a/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 892f8adade10641f1f04f04b589753d928fb5443 Mon Sep 17 00:00:00 2001 -From: Doug Torrance -Date: Sun, 9 May 2021 12:14:19 -0400 -Subject: [PATCH] Use std::ptrdiff_t for vector iterator difference type - -It was previously long (64-bit integers), but this will not be the -case on 32-bit systems. - -Closes: #273 ---- - linbox/vector/bit-vector.inl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/linbox/vector/bit-vector.inl b/linbox/vector/bit-vector.inl -index 5fa84b421..23a22ba47 100644 ---- a/linbox/vector/bit-vector.inl -+++ b/linbox/vector/bit-vector.inl -@@ -46,7 +46,7 @@ namespace std - typedef LinBox::BitVector::reference reference; - typedef bool *pointer; - typedef bool value_type; -- typedef long difference_type; -+ typedef std::ptrdiff_t difference_type; - }; - - template <> -@@ -56,7 +56,7 @@ namespace std - typedef LinBox::BitVector::const_reference reference; - typedef const bool *pointer; - typedef bool value_type; -- typedef long difference_type; -+ typedef std::ptrdiff_t difference_type; - }; - } - diff --git a/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch b/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch deleted file mode 100644 index c93915fb1b0..00000000000 --- a/srcpkgs/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@ - \------------------------------------------------------- diff --git a/srcpkgs/linbox/template b/srcpkgs/linbox/template index 096a15b3390..e6edacdd0a7 100644 --- a/srcpkgs/linbox/template +++ b/srcpkgs/linbox/template @@ -1,7 +1,7 @@ # Template file for 'linbox' pkgname=linbox -version=1.6.3 -revision=2 +version=1.7.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="fflas-ffpack" @@ -9,16 +9,15 @@ short_desc="C++ library for exact, high-performance linear algebra" maintainer="Gonzalo Tornaría " license="LGPL-2.1-or-later" homepage="https://linalg.org" +changelog="https://github.com/linbox-team/linbox/raw/master/ChangeLog" distfiles="https://github.com/linbox-team/linbox/releases/download/v${version}/linbox-${version}.tar.gz" -checksum=a58a188307b07c57964e844bceb99321d3043a8a4a1fccc082a54928bb9a0057 +checksum=6d2159fd395be0298362dd37f6c696676237bc8e2757341fbc46520e3b466bcc nocross=yes build_options="native_build" if [ -z "$build_option_native_build" ]; then - configure_args="--enable-sse --enable-sse2 - --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 - --disable-avx --disable-avx2 --disable-fma --disable-fma4" + configure_args="--without-archnative" fi linbox-devel_package() {