Skip to content

Commit

Permalink
linbox: update to 1.7.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
tornaria committed May 21, 2023
1 parent 55baa9c commit ee7a1b0
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 64 deletions.
24 changes: 24 additions & 0 deletions srcpkgs/linbox/patches/292.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 49b9cccd0286980c1c1811c3b03df883ef0164df Mon Sep 17 00:00:00 2001
From: Doug Torrance <[email protected]>
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);

38 changes: 38 additions & 0 deletions srcpkgs/linbox/patches/294.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From f81a1f4a5e0835b7a0f3bb88a0fcbbaa32174cfa Mon Sep 17 00:00:00 2001
From: Cyril Bouvier <[email protected]>
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);

This file was deleted.

23 changes: 0 additions & 23 deletions srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch

This file was deleted.

11 changes: 5 additions & 6 deletions srcpkgs/linbox/template
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
# 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"
short_desc="C++ library for exact, high-performance linear algebra"
maintainer="Gonzalo Tornaría <[email protected]>"
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() {
Expand Down

0 comments on commit ee7a1b0

Please sign in to comment.