From 610cf0fc5b695a9e3c7fc612145c7217fef5bcbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 11 Nov 2022 08:33:10 -0300 Subject: [PATCH] giac: update to 1.9.0.29. Also: use openblas instead of lapack when available. --- srcpkgs/giac/patches/giac-pari-2.15.patch | 20 -------------- srcpkgs/giac/template | 32 ++++++++++++++++++++--- 2 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/giac/patches/giac-pari-2.15.patch diff --git a/srcpkgs/giac/patches/giac-pari-2.15.patch b/srcpkgs/giac/patches/giac-pari-2.15.patch deleted file mode 100644 index be409be38f53..000000000000 --- a/srcpkgs/giac/patches/giac-pari-2.15.patch +++ /dev/null @@ -1,20 +0,0 @@ -ANYARG patch - -diff --git a/src/pari.cc b/src/pari.cc -index 76ce8e1..50d08ab 100644 ---- a/src/pari.cc -+++ b/src/pari.cc -@@ -40,6 +40,13 @@ using namespace std; - - #ifdef HAVE_LIBPARI - -+// Anyarg disappeared from PARI 2.15.0 -+#ifdef __cplusplus -+# define ANYARG ... -+#else -+# define ANYARG -+#endif -+ - #ifdef HAVE_PTHREAD_H - #include - #endif diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index f4d89a40e18b..de5bc030d785 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,11 +1,13 @@ # Template file for 'giac' pkgname=giac -version=1.9.0.27 +version=1.9.0.29 revision=1 build_style=gnu-configure configure_args="--disable-micropy --disable-quickjs" -makedepends="fltk-devel gmp-devel gsl-devel lapack-devel - libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel" +hostmakedepends="automake gettext-devel libtool pkg-config" +makedepends="fltk-devel gmp-devel gsl-devel libjpeg-turbo-devel + libpng-devel readline-devel mpfr-devel pari-devel + $(vopt_if openblas 'openblas-devel' 'lapack-devel')" depends="desktop-file-utils hicolor-icon-theme" short_desc="Free computer algebra system" maintainer="Gonzalo Tornaría " @@ -13,11 +15,33 @@ license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" -checksum=c5d222fbff5db2a0a560b4e106ce88dd13d109ecb21570a939b8b3b87521d5e0 +checksum=f6351572cad5f2331faab9a7ca6678bc869695a6c5f69a42baaed50e56790b0e # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152" +build_options="openblas" + +case "$XBPS_TARGET_MACHINE" in + x86_64*|i686*|aarch64*|armv[67]*|ppc64*) + # Prefer accelerated routines where available + build_options_default="openblas" + ;; + *) ;; +esac + + +pre_configure() { + autoreconf -fi + if [ "$build_option_openblas" ]; then + export BLAS_LIBS=-lopenblas + export BLAS_CFLAGS=-I/usr/include/openblas + export LAPACK_LIBS=-lopenblas + export LAPACK_CFLAGS=-I/usr/include/openblas + fi +} + + post_extract() { # remove a binary that works only for x86_64 host # the binary will be rebuilt using host compiler