Skip to content

Commit 1758b63

Browse files
author
Release Manager
committed
Trac #34496: disallow PARI 2.15 from the system, until giac is fixed
disallow PARI 2.15 from the system, until giac is fixed --- Was: Upgrade to PARI 2.15. (dupe of #34537) URL: https://trac.sagemath.org/34496 Reported by: slelievre Ticket author(s): Dima Pasechnik Reviewer(s): Matthias Koeppe
2 parents 54cd6fe + 1e2f16b commit 1758b63

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

build/pkgs/pari/spkg-configure.m4

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +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"])
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
45
SAGE_SPKG_DEPCHECK([gmp readline], [
56
AC_PATH_PROG([GP], [gp])
67
if test x$GP = x; then dnl GP test
@@ -101,6 +102,7 @@ SAGE_SPKG_CONFIGURE([pari], [
101102
[AC_MSG_RESULT([cross compiling. Assume they match])])
102103
AC_MSG_CHECKING([is GP's version good enough? ])
103104
AX_COMPARE_VERSION([$gp_version], [ge], [$SAGE_PARI_MINVER], [
105+
AX_COMPARE_VERSION([$gp_version], [lt], [$SAGE_PARI_MAXVER], [
104106
AC_MSG_RESULT([yes])
105107
AC_MSG_CHECKING([getting GP's datadir])
106108
gp_datadir=`echo "default(datadir)" | $GP -qf 2>> config.log`
@@ -127,13 +129,17 @@ SAGE_SPKG_CONFIGURE([pari], [
127129
[AC_MSG_RESULT([libpari's datadir does not match GP's datadir. Not good])
128130
sage_spkg_install_pari=yes],
129131
[AC_MSG_RESULT([cross compiling. Assume yes])])
130-
], [
132+
], [dnl compared maxver
133+
AC_MSG_RESULT([no])
134+
sage_spkg_install_pari=yes], [AC_MSG_RESULT([cross compiling. Assume yes])])
135+
], [dnl compared minver
131136
AC_MSG_RESULT([no])
132137
sage_spkg_install_pari=yes], [AC_MSG_RESULT([cross compiling. Assume yes])])
133138
AC_LANG_POP()
134139
], [sage_spkg_install_pari=yes])
135140
fi dnl end main PARI test
136141
])
142+
m4_popdef([SAGE_PARI_MAXVER])
137143
m4_popdef([SAGE_PARI_MINVER])
138144
], [], [], [
139145
if test x$sage_spkg_install_pari = xyes; then

0 commit comments

Comments
 (0)