From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel
Date: Mon, 08 Mar 2021 06:27:53 +0100 [thread overview]
Message-ID: <20210308052753.WvXut0PcjVBB7jmRbRrlnM5sjxC1VBsZxjwu_U0exR0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29141@inbox.vuxu.org>
[-- 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;
+ }
+
+ /*
next prev parent reply other threads:[~2021-03-08 5:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-28 22:35 [PR PATCH] " 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
2021-03-01 20:35 ` ericonr
2021-03-02 0:56 ` [PR PATCH] [Updated] " tornaria
2021-03-02 1:12 ` tornaria
2021-03-02 21:27 ` [PR PATCH] [Updated] " tornaria
2021-03-02 23:20 ` tornaria
2021-03-08 2:30 ` tornaria
2021-03-08 4:06 ` ericonr
2021-03-08 5:27 ` tornaria [this message]
2021-03-08 17:25 ` [PR PATCH] [Updated] " tornaria
2021-03-08 17:36 ` tornaria
2021-03-08 18:16 ` [PR REVIEW] " ericonr
2021-03-08 18:16 ` ericonr
2021-03-08 18:22 ` tornaria
2021-03-08 18:41 ` tornaria
2021-03-08 18:44 ` ericonr
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308052753.WvXut0PcjVBB7jmRbRrlnM5sjxC1VBsZxjwu_U0exR0@z \
--to=tornaria@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).