Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions srcpkgs/fflas-ffpack/patches/357.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 9b6083c663096e9ca85775b79f1f27c848dbeb98 Mon Sep 17 00:00:00 2001
From: Cyril Bouvier <[email protected]>
Date: Fri, 17 Dec 2021 10:27:02 +0100
Subject: [PATCH] Fix SimdChooser: on not x86_64 machines its value could be an
nonexistant struct

---
fflas-ffpack/fflas/fflas_simd.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/fflas-ffpack/fflas/fflas_simd.h b/fflas-ffpack/fflas/fflas_simd.h
index bf5d30211..84ced0fd8 100644
--- a/fflas-ffpack/fflas/fflas_simd.h
+++ b/fflas-ffpack/fflas/fflas_simd.h
@@ -384,6 +384,20 @@ struct SimdChooser<T, true, true> // integral number
#endif
};

+#ifndef __x86_64__
+template <>
+struct SimdChooser<uint64_t, true, true>
+{
+ using value = NoSimd<uint64_t>;
+};
+
+template <>
+struct SimdChooser<int64_t, true, true>
+{
+ using value = NoSimd<int64_t>;
+};
+#endif
+
template <class T> using Simd = typename SimdChooser<T>::value;

// template <class T> struct SimdChooser<T, true> {
12 changes: 5 additions & 7 deletions srcpkgs/fflas-ffpack/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'fflas-ffpack'
pkgname=fflas-ffpack
version=2.4.3
version=2.5.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
Expand All @@ -10,15 +10,13 @@ short_desc="Finite Field Linear Algebra Subroutines / Package"
maintainer="Gonzalo Tornaría <[email protected]>"
license="LGPL-2.1-or-later"
homepage="http://linbox-team.github.io/fflas-ffpack/"
distfiles="https://github.com/linbox-team/fflas-ffpack/releases/download/${version}/fflas-ffpack-${version}.tar.gz"
checksum=f372783a17a9899ee9f88d4c9421d80facccb95556146dad7020d07a03791cc9
changelog="https://github.com/linbox-team/fflas-ffpack/raw/master/ChangeLog"
distfiles="https://github.com/linbox-team/fflas-ffpack/releases/download/v${version}/fflas-ffpack-${version}.tar.gz"
checksum=dafb4c0835824d28e4f823748579be6e4c8889c9570c6ce9cce1e186c3ebbb23
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
--disable-avx512f --disable-avx512dq --disable-avx512vl"
configure_args="--without-archnative"
fi
28 changes: 28 additions & 0 deletions srcpkgs/givaro/patches/197.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From ab3d332508c21daff41fb64a8658cdc7cc74fc47 Mon Sep 17 00:00:00 2001
From: Cyril Bouvier <[email protected]>
Date: Thu, 16 Dec 2021 17:12:25 +0100
Subject: [PATCH] dom_power argument is now an uint64_t to avoid problem with
32bit machine

---
src/kernel/system/givpower.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kernel/system/givpower.h b/src/kernel/system/givpower.h
index eb784872..5644264d 100644
--- a/src/kernel/system/givpower.h
+++ b/src/kernel/system/givpower.h
@@ -71,11 +71,11 @@ namespace Givaro {

//! dom_power
template<class D, class TT>
- TT& dom_power(TT& res, const TT& n, long l, const D& F)
+ TT& dom_power(TT& res, const TT& n, uint64_t l, const D& F)
{
if (l == 0) return F.assign(res,F.one) ;

- unsigned long p = (unsigned long) l ;
+ uint64_t p = l;
bool is_assg = false ;

TT puiss; F.init(puiss); F.assign(puiss,n) ;
9 changes: 4 additions & 5 deletions srcpkgs/givaro/template
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
# Template file for 'givaro'
pkgname=givaro
version=4.1.1
version=4.2.0
revision=1
build_style=gnu-configure
makedepends="gmpxx-devel"
short_desc="C++ library for arithmetic and algebraic computations"
maintainer="Gonzalo Tornaría <[email protected]>"
license="CECILL-B"
homepage="https://github.com/linbox-team/givaro"
changelog="https://github.com/linbox-team/givaro/raw/master/ChangeLog"
distfiles="https://github.com/linbox-team/givaro/releases/download/v${version}/givaro-${version}.tar.gz"
checksum=628049899386e91da245aee6cd446350fbca87e94863bc0d815066c08150487f
checksum=865e228812feca971dfb6e776a7bc7ac959cf63ebd52b4f05492730a46e1f189
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

post_install() {
Expand Down
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

This file was deleted.

20 changes: 10 additions & 10 deletions srcpkgs/maxima/template
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
# Template file for 'maxima'
pkgname=maxima
version=5.45.1
revision=4
version=5.46.0
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
hostmakedepends="python3 perl emacs texinfo patchelf"
hostmakedepends="python3 perl texinfo patchelf $(vopt_if ecl ecl)"
makedepends="$(vopt_if clisp clisp) $(vopt_if sbcl sbcl) $(vopt_if ecl ecl)"
depends="$(vopt_if clisp clisp) rlwrap"
checkdepends="gnuplot"
short_desc="Computer Algebra System"
maintainer="Bosco Garcia <[email protected]>"
maintainer="Gonzalo Tornaría <[email protected]>"
license="GPL-2.0-only"
homepage="http://maxima.sourceforge.net"
changelog="https://sourceforge.net/p/maxima/code/ci/master/tree/changelogs/ChangeLog-${version%.*}.md?format=raw"
distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
checksum=fe9016276970bef214a1a244348558644514d7fdfaa4fc8b9d0e87afcbb4e7dc
checksum=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07
nocross=yes

# maxima-sbcl is nopie and should NOT be stripped or it won't work
nostrip_files=/usr/lib/maxima/$version/binary-sbcl/maxima
Expand All @@ -32,7 +34,7 @@ build_options_default="ecl"

# sbcl is only available for these architectures
case "$XBPS_TARGET_MACHINE" in
i686|x86_64*|armv7l|aarch64|ppc64le*)
i686|x86_64*|armv7l|ppc64le*)
build_options_default+=" sbcl"
;;
esac
Expand Down Expand Up @@ -113,11 +115,9 @@ maxima-src_package() {
}

maxima-emacs_package() {
short_desc+=" - Emacs interface"
short_desc+=" - transitional dummy package"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
vmove usr/share/emacs
}
build_style=meta
}

xmaxima_package() {
Expand Down
1 change: 0 additions & 1 deletion srcpkgs/sagemath/files/sage_conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# configuration for sage on void linux
SAGE_SHARE = "/usr/share/sagemath"
GAP_SHARE_DIR = "/usr/share/gap"
GAP_LIB_DIR = "/usr/lib/gap"
Loading