* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
@ 2021-03-01 9:51 ` dkwo
2021-03-01 18:53 ` tornaria
` (21 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: dkwo @ 2021-03-01 9:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-787816411
Comment:
I can confirm it builds and works fine on `x86_64-musl`.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
2021-03-01 9:51 ` dkwo
@ 2021-03-01 18:53 ` tornaria
2021-03-01 20:21 ` ericonr
` (20 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-01 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 652 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-788185891
Comment:
> I can confirm it builds and works fine on `x86_64-musl`.
Did you run make check? Because there are some test failures that only seem to happen for x86_64-musl, e.g.:
```
0>> integrate(atan(sqrt(1-x**2)),x,0,1)
"Unable to handle singularities of -1/2*pi-sqrt(2)*(-1/2*pi-atan(sqrt(2)*x*((-1/2*(-2*sqrt(-x^2+1)+2)/x)^2-1)/(-2*sqrt(-x^2+1)+2)))-atan(x*((-1/2*(-2*sqrt(-x^2+1)+2)/x)^2-1)/(-2*sqrt(-x^2+1)+2))+x*atan(sqrt(-x^2+1)) at [undef] Error: Bad Argument Value"
```
I don't use musl myself.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
2021-03-01 9:51 ` dkwo
2021-03-01 18:53 ` tornaria
@ 2021-03-01 20:21 ` ericonr
2021-03-01 20:32 ` dkwo
` (19 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-01 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-788244506
Comment:
> 2021-02-28T22:50:27.3688440Z FAIL: chk_xavier
That's on glibc. It might be nice to report the musl errors if they can be traced back to musl :) I will try to group them together.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (2 preceding siblings ...)
2021-03-01 20:21 ` ericonr
@ 2021-03-01 20:32 ` dkwo
2021-03-01 20:35 ` ericonr
` (18 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: dkwo @ 2021-03-01 20:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-788253867
Comment:
It actually fails 8 of 30 tests on musl:
FAIL: chk_integrate
FAIL: chk_morley_demo
FAIL: chk_xavier
FAIL: chk_fhan0
FAIL: chk_fhan14
FAIL: chk_fhan16
FAIL: chk_fhan18
FAIL: chk_fhan7
Can provide more details if needed.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (3 preceding siblings ...)
2021-03-01 20:32 ` dkwo
@ 2021-03-01 20:35 ` ericonr
2021-03-02 0:56 ` [PR PATCH] [Updated] " tornaria
` (17 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-01 20:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-788255501
Comment:
I am aware of the test failures on musl, but we'd have to track down where they go wrong.
For now, it would be nice if it at least worked on glibc cleanly :)
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (4 preceding siblings ...)
2021-03-01 20:35 ` ericonr
@ 2021-03-02 0:56 ` tornaria
2021-03-02 1:12 ` tornaria
` (16 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-02 0:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 2840 bytes --]
From eac54a22082671c4ba3e575752fdb4e9f68341fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH] giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
---
common/shlibs | 1 +
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index 959f1692961..0e5287889f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libtree-sitter.so.0 tree-sitter-0.18.2_1
+libpari-gmp.so.7 pari-2.13.0_1
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..2eb82c5d62b 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (5 preceding siblings ...)
2021-03-02 0:56 ` [PR PATCH] [Updated] " tornaria
@ 2021-03-02 1:12 ` tornaria
2021-03-02 21:27 ` [PR PATCH] [Updated] " tornaria
` (15 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-02 1:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 716 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-788479508
Comment:
The glibc segfault is weird:
- When compiling giac _in_ sage, the resulting binary does _not_ have the issue
- The source in sage is the same version (1.5.0.87, with minor patches)
- Compiling the source as patched by sage, still has the issue
- Both compiled in the same box, same compiler, etc.
Maybe the issue is in a dependency.
I think the segfault is gone with giac-1.6.0.47, all tests pass in glibc. OTOH, compiling in musl still has 8 test failing. `Error: Bad Argument Value"` seems to cause a lot of these, perhaps some difference in the math library...
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (6 preceding siblings ...)
2021-03-02 1:12 ` tornaria
@ 2021-03-02 21:27 ` tornaria
2021-03-02 23:20 ` tornaria
` (14 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-02 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 3884 bytes --]
From eac54a22082671c4ba3e575752fdb4e9f68341fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH 1/2] giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
---
common/shlibs | 1 +
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index 959f1692961..0e5287889f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libtree-sitter.so.0 tree-sitter-0.18.2_1
+libpari-gmp.so.7 pari-2.13.0_1
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..2eb82c5d62b 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
From 89889c65403f558567dabc163bb95961e0734f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 Mar 2021 18:25:47 -0300
Subject: [PATCH 2/2] giac: fix stack size issue in musl
---
srcpkgs/giac/patches/stacksize.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/giac/patches/stacksize.patch
diff --git a/srcpkgs/giac/patches/stacksize.patch b/srcpkgs/giac/patches/stacksize.patch
new file mode 100644
index 00000000000..3f700f6638d
--- /dev/null
+++ b/srcpkgs/giac/patches/stacksize.patch
@@ -0,0 +1,11 @@
+--- src/gen.cc.orig 2020-02-10 16:46:44.000000000 -0300
++++ src/gen.cc 2021-03-02 18:19:23.426972309 -0300
+@@ -11803,7 +11803,7 @@
+ return 1;
+ }
+ }
+-#if !defined(WIN32) && defined(HAVE_PTHREAD_H)
++#if !defined(WIN32) && defined(HAVE_PTHREAD_H) && defined __GLIBC__
+ if (contextptr && thread_param_ptr(contextptr)->stackaddr && thread_param_ptr(contextptr)->stacksize/2){
+ gen er;
+ short int err=s.size();
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (7 preceding siblings ...)
2021-03-02 21:27 ` [PR PATCH] [Updated] " tornaria
@ 2021-03-02 23:20 ` tornaria
2021-03-08 2:30 ` tornaria
` (13 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-02 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 3922 bytes --]
From bc05daed59b0439422a6109a3ab90d224e3cb5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH 1/2] giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
---
common/shlibs | 1 +
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index c836cc1a377..5b60ba997a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3923,4 +3923,5 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
+libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..2eb82c5d62b 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
From 25d01c26dcbe594e9e0c6b3c57de74ef73371bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 Mar 2021 18:25:47 -0300
Subject: [PATCH 2/2] giac: fix stack size issue in musl
---
srcpkgs/giac/patches/stacksize.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/giac/patches/stacksize.patch
diff --git a/srcpkgs/giac/patches/stacksize.patch b/srcpkgs/giac/patches/stacksize.patch
new file mode 100644
index 00000000000..3f700f6638d
--- /dev/null
+++ b/srcpkgs/giac/patches/stacksize.patch
@@ -0,0 +1,11 @@
+--- src/gen.cc.orig 2020-02-10 16:46:44.000000000 -0300
++++ src/gen.cc 2021-03-02 18:19:23.426972309 -0300
+@@ -11803,7 +11803,7 @@
+ return 1;
+ }
+ }
+-#if !defined(WIN32) && defined(HAVE_PTHREAD_H)
++#if !defined(WIN32) && defined(HAVE_PTHREAD_H) && defined __GLIBC__
+ if (contextptr && thread_param_ptr(contextptr)->stackaddr && thread_param_ptr(contextptr)->stacksize/2){
+ gen er;
+ short int err=s.size();
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (8 preceding siblings ...)
2021-03-02 23:20 ` tornaria
@ 2021-03-08 2:30 ` tornaria
2021-03-08 4:06 ` ericonr
` (12 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 2:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 5734 bytes --]
From 2ce003ae28d51b5675d8e29b8d7abe71cc460a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH 1/3] giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
---
common/shlibs | 1 +
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index a911b3892cbc..25e15aed6306 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,4 +3964,5 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
+libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 000000000000..7bd12dd1ce7b
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b739..2eb82c5d62bb 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
From b7b2b850cc58cacf57b8d9b27627cbb2d91da494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 Mar 2021 18:25:47 -0300
Subject: [PATCH 2/3] giac: fix stack size issue in musl
---
srcpkgs/giac/patches/stacksize.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/giac/patches/stacksize.patch
diff --git a/srcpkgs/giac/patches/stacksize.patch b/srcpkgs/giac/patches/stacksize.patch
new file mode 100644
index 000000000000..3f700f6638d0
--- /dev/null
+++ b/srcpkgs/giac/patches/stacksize.patch
@@ -0,0 +1,11 @@
+--- src/gen.cc.orig 2020-02-10 16:46:44.000000000 -0300
++++ src/gen.cc 2021-03-02 18:19:23.426972309 -0300
+@@ -11803,7 +11803,7 @@
+ return 1;
+ }
+ }
+-#if !defined(WIN32) && defined(HAVE_PTHREAD_H)
++#if !defined(WIN32) && defined(HAVE_PTHREAD_H) && defined __GLIBC__
+ if (contextptr && thread_param_ptr(contextptr)->stackaddr && thread_param_ptr(contextptr)->stacksize/2){
+ gen er;
+ short int err=s.size();
From 1aea2be3c2e951b94366698cf1c309cd8c2fd9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 7 Mar 2021 23:30:16 -0300
Subject: [PATCH 3/3] giac: different fix, increase stacksize in musl
---
srcpkgs/giac/patches/stacksize.patch | 11 -----------
srcpkgs/giac/template | 5 +++++
2 files changed, 5 insertions(+), 11 deletions(-)
delete mode 100644 srcpkgs/giac/patches/stacksize.patch
diff --git a/srcpkgs/giac/patches/stacksize.patch b/srcpkgs/giac/patches/stacksize.patch
deleted file mode 100644
index 3f700f6638d0..000000000000
--- a/srcpkgs/giac/patches/stacksize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gen.cc.orig 2020-02-10 16:46:44.000000000 -0300
-+++ src/gen.cc 2021-03-02 18:19:23.426972309 -0300
-@@ -11803,7 +11803,7 @@
- return 1;
- }
- }
--#if !defined(WIN32) && defined(HAVE_PTHREAD_H)
-+#if !defined(WIN32) && defined(HAVE_PTHREAD_H) && defined __GLIBC__
- if (contextptr && thread_param_ptr(contextptr)->stackaddr && thread_param_ptr(contextptr)->stacksize/2){
- gen er;
- short int err=s.size();
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 2eb82c5d62bb..49c386557510 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -14,6 +14,11 @@ homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
+ LDFLAGS+=" -Wl,-z,stack-size=1048576"
+fi
+
post_install() {
# remove duplicates
rm -r ${DESTDIR}/usr/share/doc
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (9 preceding siblings ...)
2021-03-08 2:30 ` tornaria
@ 2021-03-08 4:06 ` ericonr
2021-03-08 5:27 ` [PR PATCH] [Updated] " tornaria
` (11 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-08 4:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-792446793
Comment:
Remember to squash the commits :)
I don't really understand much about math libraries... If the resulting package works, we can at least leave a comment in the template that some tests need fixing.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (10 preceding siblings ...)
2021-03-08 4:06 ` ericonr
@ 2021-03-08 5:27 ` tornaria
2021-03-08 17:25 ` tornaria
` (10 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 5:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 6702 bytes --]
From 2ce003ae28d51b5675d8e29b8d7abe71cc460a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH 1/4] giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
---
common/shlibs | 1 +
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..25e15aed630 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,4 +3964,5 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
+libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..2eb82c5d62b 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
From b7b2b850cc58cacf57b8d9b27627cbb2d91da494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 Mar 2021 18:25:47 -0300
Subject: [PATCH 2/4] giac: fix stack size issue in musl
---
srcpkgs/giac/patches/stacksize.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/giac/patches/stacksize.patch
diff --git a/srcpkgs/giac/patches/stacksize.patch b/srcpkgs/giac/patches/stacksize.patch
new file mode 100644
index 00000000000..3f700f6638d
--- /dev/null
+++ b/srcpkgs/giac/patches/stacksize.patch
@@ -0,0 +1,11 @@
+--- src/gen.cc.orig 2020-02-10 16:46:44.000000000 -0300
++++ src/gen.cc 2021-03-02 18:19:23.426972309 -0300
+@@ -11803,7 +11803,7 @@
+ return 1;
+ }
+ }
+-#if !defined(WIN32) && defined(HAVE_PTHREAD_H)
++#if !defined(WIN32) && defined(HAVE_PTHREAD_H) && defined __GLIBC__
+ if (contextptr && thread_param_ptr(contextptr)->stackaddr && thread_param_ptr(contextptr)->stacksize/2){
+ gen er;
+ short int err=s.size();
From 1aea2be3c2e951b94366698cf1c309cd8c2fd9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 7 Mar 2021 23:30:16 -0300
Subject: [PATCH 3/4] giac: different fix, increase stacksize in musl
---
srcpkgs/giac/patches/stacksize.patch | 11 -----------
srcpkgs/giac/template | 5 +++++
2 files changed, 5 insertions(+), 11 deletions(-)
delete mode 100644 srcpkgs/giac/patches/stacksize.patch
diff --git a/srcpkgs/giac/patches/stacksize.patch b/srcpkgs/giac/patches/stacksize.patch
deleted file mode 100644
index 3f700f6638d..00000000000
--- a/srcpkgs/giac/patches/stacksize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gen.cc.orig 2020-02-10 16:46:44.000000000 -0300
-+++ src/gen.cc 2021-03-02 18:19:23.426972309 -0300
-@@ -11803,7 +11803,7 @@
- return 1;
- }
- }
--#if !defined(WIN32) && defined(HAVE_PTHREAD_H)
-+#if !defined(WIN32) && defined(HAVE_PTHREAD_H) && defined __GLIBC__
- if (contextptr && thread_param_ptr(contextptr)->stackaddr && thread_param_ptr(contextptr)->stacksize/2){
- gen er;
- short int err=s.size();
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 2eb82c5d62b..49c38655751 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -14,6 +14,11 @@ homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
+ LDFLAGS+=" -Wl,-z,stack-size=1048576"
+fi
+
post_install() {
# remove duplicates
rm -r ${DESTDIR}/usr/share/doc
From ee8683ff3b4612ed1a3ef8e0a81333478caa0ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 8 Mar 2021 02:27:09 -0300
Subject: [PATCH 4/4] giac: fix for the last test failed
---
srcpkgs/giac/patches/invmod.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/giac/patches/invmod.patch
diff --git a/srcpkgs/giac/patches/invmod.patch b/srcpkgs/giac/patches/invmod.patch
new file mode 100644
index 00000000000..6aab28d7253
--- /dev/null
+++ b/srcpkgs/giac/patches/invmod.patch
@@ -0,0 +1,14 @@
+--- src/modpoly.cc.orig 2020-02-18 10:07:10.000000000 -0300
++++ src/modpoly.cc 2021-03-08 02:18:09.443740199 -0300
+@@ -92,7 +92,10 @@
+ gen invenv(const gen & g,environment * env){
+ if (g.type==_USER)
+ return g._USERptr->inv();
+- return invmod(g,env->modulo);
++ if (env->moduloon)
++ return invmod(g,env->modulo);
++ else
++ return gen(1)/g;
+ }
+
+ /*
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (11 preceding siblings ...)
2021-03-08 5:27 ` [PR PATCH] [Updated] " tornaria
@ 2021-03-08 17:25 ` tornaria
2021-03-08 17:36 ` tornaria
` (9 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 17:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 4345 bytes --]
From 06ed2689c4fa3b3ad4a14c64e6b75ccff0234e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH] giac: missing dependencies and fixes
- makedepend on mpfr-devel: used for arbitrary precision floats,
otherwise they are limited to double precision (53 bits ~ 13 digits)
- makedepend on pari-devel: used for number theory functions
- fix one line of test output to match a change in pari
- fix a bug in invmod which resulted in a test fail (chk_xavier)
- increase stacksize in musl which is needed for tests to pass
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, all 12 tests pass in glibc and in musl.
See #28989 for the original issue.
---
common/shlibs | 1 +
srcpkgs/giac/patches/invmod.patch | 14 ++++++++++++++
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 9 +++++++--
4 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/invmod.patch
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..25e15aed630 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,4 +3964,5 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
+libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/giac/patches/invmod.patch b/srcpkgs/giac/patches/invmod.patch
new file mode 100644
index 00000000000..6aab28d7253
--- /dev/null
+++ b/srcpkgs/giac/patches/invmod.patch
@@ -0,0 +1,14 @@
+--- src/modpoly.cc.orig 2020-02-18 10:07:10.000000000 -0300
++++ src/modpoly.cc 2021-03-08 02:18:09.443740199 -0300
+@@ -92,7 +92,10 @@
+ gen invenv(const gen & g,environment * env){
+ if (g.type==_USER)
+ return g._USERptr->inv();
+- return invmod(g,env->modulo);
++ if (env->moduloon)
++ return invmod(g,env->modulo);
++ else
++ return gen(1)/g;
+ }
+
+ /*
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..49c38655751 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,11 @@ homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
+ LDFLAGS+=" -Wl,-z,stack-size=1048576"
+fi
+
post_install() {
# remove duplicates
rm -r ${DESTDIR}/usr/share/doc
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (12 preceding siblings ...)
2021-03-08 17:25 ` tornaria
@ 2021-03-08 17:36 ` tornaria
2021-03-08 18:16 ` [PR REVIEW] " ericonr
` (8 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 17:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-792935697
Comment:
I think this is ready to merge.
All tests pass now, both glibc and musl.
Squashed in one commit (https://github.com/void-linux/void-packages/commit/06ed2689c4fa3b3ad4a14c64e6b75ccff0234e90)
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR REVIEW] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (13 preceding siblings ...)
2021-03-08 17:36 ` tornaria
@ 2021-03-08 18:16 ` ericonr
2021-03-08 18:16 ` ericonr
` (7 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-08 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#discussion_r589643135
Comment:
ah, nice find! You can apply this unconditionally, it shouldn't affect the resulting glibc binary.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR REVIEW] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (14 preceding siblings ...)
2021-03-08 18:16 ` [PR REVIEW] " ericonr
@ 2021-03-08 18:16 ` ericonr
2021-03-08 18:22 ` tornaria
` (6 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-08 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#discussion_r589643329
Comment:
Is this patch from upstream as well?
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR REVIEW] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (15 preceding siblings ...)
2021-03-08 18:16 ` ericonr
@ 2021-03-08 18:22 ` tornaria
2021-03-08 18:41 ` tornaria
` (5 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#discussion_r589647058
Comment:
It's my patch. I'll send it upstream.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR REVIEW] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (16 preceding siblings ...)
2021-03-08 18:22 ` tornaria
@ 2021-03-08 18:41 ` tornaria
2021-03-08 18:44 ` ericonr
` (4 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#discussion_r589659489
Comment:
I was in doubt. Should I make the stack as small as required to pass tests (~270K seems enough)?
I'd rather give it some slack to be safe.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR REVIEW] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (17 preceding siblings ...)
2021-03-08 18:41 ` tornaria
@ 2021-03-08 18:44 ` ericonr
2021-03-08 18:55 ` [PR PATCH] [Updated] " tornaria
` (3 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-08 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#discussion_r589661584
Comment:
Oh, I meant the test for musl wasn't necessary. And you should just set `LDFLAGS`, not add to it. The value is good, though 2MB is closer to glibc's default thread stack size, if you want to go with that.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (18 preceding siblings ...)
2021-03-08 18:44 ` ericonr
@ 2021-03-08 18:55 ` tornaria
2021-03-08 19:03 ` tornaria
` (2 subsequent siblings)
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 18:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 4345 bytes --]
From 98f5edac51cad5498c07366aa352055a98d4c4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH] giac: missing dependencies and fixes
- makedepend on mpfr-devel: used for arbitrary precision floats,
otherwise they are limited to double precision (53 bits ~ 13 digits)
- makedepend on pari-devel: used for number theory functions
- fix one line of test output to match a change in pari
- fix a bug in invmod which resulted in a test fail (chk_xavier)
- increase stacksize in musl which is needed for tests to pass
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, all 12 tests pass in glibc and in musl.
See #28989 for the original issue.
---
common/shlibs | 1 +
srcpkgs/giac/patches/invmod.patch | 14 ++++++++++++++
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 9 +++++++--
4 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/invmod.patch
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..25e15aed630 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,4 +3964,5 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
+libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/giac/patches/invmod.patch b/srcpkgs/giac/patches/invmod.patch
new file mode 100644
index 00000000000..6aab28d7253
--- /dev/null
+++ b/srcpkgs/giac/patches/invmod.patch
@@ -0,0 +1,14 @@
+--- src/modpoly.cc.orig 2020-02-18 10:07:10.000000000 -0300
++++ src/modpoly.cc 2021-03-08 02:18:09.443740199 -0300
+@@ -92,7 +92,10 @@
+ gen invenv(const gen & g,environment * env){
+ if (g.type==_USER)
+ return g._USERptr->inv();
+- return invmod(g,env->modulo);
++ if (env->moduloon)
++ return invmod(g,env->modulo);
++ else
++ return gen(1)/g;
+ }
+
+ /*
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..49c38655751 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,11 @@ homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
+ LDFLAGS+=" -Wl,-z,stack-size=1048576"
+fi
+
post_install() {
# remove duplicates
rm -r ${DESTDIR}/usr/share/doc
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (19 preceding siblings ...)
2021-03-08 18:55 ` [PR PATCH] [Updated] " tornaria
@ 2021-03-08 19:03 ` tornaria
2021-03-08 20:08 ` ericonr
2021-03-08 20:08 ` [PR PATCH] [Merged]: " ericonr
22 siblings, 0 replies; 24+ messages in thread
From: tornaria @ 2021-03-08 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 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/29141
giac: makedepend on mpfr-devel and pari-devel
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
A patch file from https://github.com/void-linux/void-packages/pull/29141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giac-29141.patch --]
[-- Type: text/x-diff, Size: 4293 bytes --]
From 87b491dbf9834078b39d3aa6e6216415774d9958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH] giac: missing dependencies and fixes
- makedepend on mpfr-devel: used for arbitrary precision floats,
otherwise they are limited to double precision (53 bits ~ 13 digits)
- makedepend on pari-devel: used for number theory functions
- fix one line of test output to match a change in pari
- fix a bug in invmod which resulted in a test fail (chk_xavier)
- increase stacksize in musl which is needed for tests to pass
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, all 12 tests pass in glibc and in musl.
See #28989 for the original issue.
---
common/shlibs | 1 +
srcpkgs/giac/patches/invmod.patch | 14 ++++++++++++++
srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
srcpkgs/giac/template | 7 +++++--
4 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/giac/patches/invmod.patch
create mode 100644 srcpkgs/giac/patches/pari_2_11.patch
diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..25e15aed630 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,4 +3964,5 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
+libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/giac/patches/invmod.patch b/srcpkgs/giac/patches/invmod.patch
new file mode 100644
index 00000000000..6aab28d7253
--- /dev/null
+++ b/srcpkgs/giac/patches/invmod.patch
@@ -0,0 +1,14 @@
+--- src/modpoly.cc.orig 2020-02-18 10:07:10.000000000 -0300
++++ src/modpoly.cc 2021-03-08 02:18:09.443740199 -0300
+@@ -92,7 +92,10 @@
+ gen invenv(const gen & g,environment * env){
+ if (g.type==_USER)
+ return g._USERptr->inv();
+- return invmod(g,env->modulo);
++ if (env->moduloon)
++ return invmod(g,env->modulo);
++ else
++ return gen(1)/g;
+ }
+
+ /*
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..ca95534498f 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
# Template file for 'giac'
pkgname=giac
version=1.5.0.87
-revision=3
+revision=4
wrksrc="giac-${version%.*}"
build_style=gnu-configure
makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free computer algebra system"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,9 @@ homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
+# need more than 4*65536 stack, see try_parse() in gen.cc line 11812
+LDFLAGS="-Wl,-z,stack-size=2097152"
+
post_install() {
# remove duplicates
rm -r ${DESTDIR}/usr/share/doc
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (20 preceding siblings ...)
2021-03-08 19:03 ` tornaria
@ 2021-03-08 20:08 ` ericonr
2021-03-08 20:08 ` [PR PATCH] [Merged]: " ericonr
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-08 20:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29141#issuecomment-793039934
Comment:
Wonderful, thanks for the detailed commit message
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Merged]: giac: makedepend on mpfr-devel and pari-devel
2021-02-28 22:35 [PR PATCH] giac: makedepend on mpfr-devel and pari-devel tornaria
` (21 preceding siblings ...)
2021-03-08 20:08 ` ericonr
@ 2021-03-08 20:08 ` ericonr
22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-03-08 20:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 566 bytes --]
There's a merged pull request on the void-packages repository
giac: makedepend on mpfr-devel and pari-devel
https://github.com/void-linux/void-packages/pull/29141
Description:
- mpfr is used for arbitrary precision floats, otherwise they are
limited to double precision (53 bits ~ 13 digits)
- pari is used for number theory functions
In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.
With this commit, make check goes from 12 tests failed to 1 test failed.
See #28989.
^ permalink raw reply [flat|nested] 24+ messages in thread