Skip to content

Commit 0f25b00

Browse files
author
Release Manager
committed
Trac #34537: Upgrade to pari 2.15.2
PARI/GP 2.15 is out, and homebrew, gentoo, arch, debian-unstable already have the new version. - giac does not build, see [[https://trac.sagemath.org/raw- attachment/ticket/34537/giac-1.9.0.15p0.log|giac-1.9.0.15p0.log]] URL: https://trac.sagemath.org/34537 Reported by: vdelecroix Ticket author(s): Bill Allombert, Vincent Delecroix, Antonio Rojas Reviewer(s): Dima Pasechnik, John Cremona
2 parents b5c9fed + e8cfad0 commit 0f25b00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+346
-454
lines changed

build/pkgs/configure/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=7d95f0aa4a25b8160594f08bf5832fdad6774ee1
3-
md5=08d682dfb7eae43af051188205449f02
4-
cksum=1634731426
2+
sha1=989f4d14dd5ffaa6ec10c3574eb05bf8936bc493
3+
md5=b5c5cde1e8679d1859d8535ed9df961c
4+
cksum=2678132185
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
272c557d1f34fab9617dcf289a13bc7f51e2854e
1+
156046b3bdfd1913720f061f9cd1cd9b23487041
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
ANYARG patch
2+
3+
diff --git a/src/pari.cc b/src/pari.cc
4+
index 76ce8e1..50d08ab 100644
5+
--- a/src/pari.cc
6+
+++ b/src/pari.cc
7+
@@ -40,6 +40,13 @@ using namespace std;
8+
9+
#ifdef HAVE_LIBPARI
10+
11+
+// Anyarg disappeared from PARI 2.15.0
12+
+#ifdef __cplusplus
13+
+# define ANYARG ...
14+
+#else
15+
+# define ANYARG
16+
+#endif
17+
+
18+
#ifdef HAVE_PTHREAD_H
19+
#include <pthread.h>
20+
#endif
21+

build/pkgs/pari/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pari-VERSION.tar.gz
2-
sha1=e01647aab7e96a8cb4922cf26a4f224337c6647f
3-
md5=922f740fcdf8630b30d63dc76b58f756
4-
cksum=297133525
2+
sha1=498e3cd0b7ded8be3fa1cba1125ca5213ed39453
3+
md5=562a6e973ca3980dc6c1eb2c4f252e92
4+
cksum=4081416981
55
upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-VERSION.tar.gz

build/pkgs/pari/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.13.3
1+
2.15.2.p1

build/pkgs/pari/patches/bug2441.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/src/basemath/ellsea.c b/src/basemath/ellsea.c
2+
index a6871fa6a7..05f148eadd 100644
3+
--- a/src/basemath/ellsea.c
4+
+++ b/src/basemath/ellsea.c
5+
@@ -852,7 +852,8 @@ find_isogenous_from_Atkin(GEN a4, GEN a6, ulong ell, struct meqn *MEQN, GEN g, G
6+
GEN a4t, a6t, h;
7+
a4a6t(&a4t, &a6t, ell, E4t, E6t, T, p);
8+
h = find_kernel(a4, a6, ell, a4t, a6t, pp1, T, p, pp, e);
9+
- if (h) return gerepilecopy(ltop, mkvec3(a4t, a6t, h));
10+
+ if (h && signe(Fq_elldivpolmod(a4, a6, ell, h, T, pp))==0)
11+
+ return gerepilecopy(ltop, mkvec3(a4t, a6t, h));
12+
}
13+
}
14+
pari_err_BUG("find_isogenous_from_Atkin, kernel not found");

build/pkgs/pari/spkg-configure.m4

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SAGE_SPKG_CONFIGURE([pari], [
22
dnl See gp_version below on how the version is computed from MAJV.MINV.PATCHV
3-
m4_pushdef([SAGE_PARI_MINVER],["134401"])dnl this version and higher allowed
4-
m4_pushdef([SAGE_PARI_MAXVER],["134912"])dnl this version and higher not allowed
3+
m4_pushdef([SAGE_PARI_MINVER],["134912"])dnl this version and higher allowed
4+
m4_pushdef([SAGE_PARI_MAXVER],["999999"])dnl this version and higher not allowed
55
SAGE_SPKG_DEPCHECK([gmp readline], [
66
AC_PATH_PROG([GP], [gp])
77
if test x$GP = x; then dnl GP test
@@ -67,17 +67,6 @@ SAGE_SPKG_CONFIGURE([pari], [
6767
AC_MSG_NOTICE([Otherwise Sage will build its own pari/GP.])
6868
sage_spkg_install_pari=yes
6969
fi
70-
AC_MSG_CHECKING([whether rnfdisc bug of pari 2.13.1 is fixed])
71-
bug_check=`echo "K = nfinit(y^4-10*y^2+1); disc = rnfdisc(K,x^2-(y^3/2+y^2-5*y/2+1)); idealnorm(K,disc)" | $GP -qf 2>> config.log`
72-
expected="2304"
73-
if test x"$bug_check" = x"$expected"; then
74-
AC_MSG_RESULT([yes])
75-
else
76-
AC_MSG_RESULT([no; cannot use system pari/GP with known bug])
77-
AC_MSG_NOTICE([Upgrade your system package and reconfigure.])
78-
AC_MSG_NOTICE([Otherwise Sage will build its own pari/GP.])
79-
sage_spkg_install_pari=yes
80-
fi
8170
fi dnl end GP test
8271
8372
if test x$sage_spkg_install_pari = xno; then dnl main PARI test

src/doc/de/tutorial/tour_numtheory.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ implementiert.
157157
Univariate Quotient Polynomial Ring in a over Rational Field with modulus
158158
x^3 + x^2 - 2*x + 8
159159
sage: K.units()
160-
(3*a^2 + 13*a + 13,)
160+
(-3*a^2 - 13*a - 13,)
161161
sage: K.discriminant()
162162
-503
163163
sage: K.class_group()

src/doc/en/tutorial/tour_numtheory.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ NumberField class.
157157
Univariate Quotient Polynomial Ring in a over Rational Field with modulus
158158
x^3 + x^2 - 2*x + 8
159159
sage: K.units()
160-
(3*a^2 + 13*a + 13,)
160+
(-3*a^2 - 13*a - 13,)
161161
sage: K.discriminant()
162162
-503
163163
sage: K.class_group()

src/doc/es/tutorial/tour_numtheory.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Varios métodos relacionados están implementados en la clase ``NumberField``::
140140
Univariate Quotient Polynomial Ring in a over Rational Field with modulus
141141
x^3 + x^2 - 2*x + 8
142142
sage: K.units()
143-
(3*a^2 + 13*a + 13,)
143+
(-3*a^2 - 13*a - 13,)
144144
sage: K.discriminant()
145145
-503
146146
sage: K.class_group()

0 commit comments

Comments
 (0)