[PR PATCH] giac: update to 1.9.0.29.

[PR PATCH] giac: update to 1.9.0.29.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages giac
https://github.com/void-linux/void-packages/pull/40491

giac: update to 1.9.0.29.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40491.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-40491.patch --]
[-- Type: text/x-diff, Size: 1985 bytes --]

From f229aa18e782bea512bf728e1168093a3aee76ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 11 Nov 2022 08:33:10 -0300
Subject: [PATCH] giac: update to 1.9.0.29.

---
 srcpkgs/giac/patches/giac-pari-2.15.patch | 20 --------------------
 srcpkgs/giac/template                     |  4 ++--
 2 files changed, 2 insertions(+), 22 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 <pthread.h>
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index f4d89a40e18b..ce7273617fee 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # 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"
@@ -13,7 +13,7 @@ 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"

Re: [PR PATCH] [Updated] giac: update to 1.9.0.29.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages giac
https://github.com/void-linux/void-packages/pull/40491

giac: update to 1.9.0.29.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40491.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-40491.patch --]
[-- Type: text/x-diff, Size: 3148 bytes --]

From 610cf0fc5b695a9e3c7fc612145c7217fef5bcbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 <pthread.h>
- #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 <tornaria@cmat.edu.uy>"
@@ -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

Re: [PR PATCH] [Merged]: giac: update to 1.9.0.29.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]

There's a merged pull request on the void-packages repository

giac: update to 1.9.0.29.
https://github.com/void-linux/void-packages/pull/40491

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: giac: update to 1.9.0.29.

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40491#issuecomment-1329806086

Comment:
is it expected that now giac does not depend on blas or lapack on x86_64-musl? I only realised it now, after xbps-remove -oO, and guessed this pr made the change.

Re: giac: update to 1.9.0.29.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/40491#issuecomment-1329855931

Comment:
> is it expected that now giac does not depend on blas or lapack on x86_64-musl? I only realised it now, after xbps-remove -oO, and guessed this pr made the change.

Yes. I've been changing packages to prefer using openblas rather than lapack when available. See for example #39846 (SuiteSparse, cvxopt) and #40224 (igraph) which are awaiting merge.

The point is that lapack is just a portable reference implementation of blas/lapack that is replaceable by an optimized implementation like openblas (or the one by intel, but I don't think it's free).