From 08dc02d8d937403e94e2f9962cb443787009dd93 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 12 Mar 2020 14:07:34 -0400 Subject: [PATCH 1/2] pari spkf-configure.m4: Check for gphelp --- build/pkgs/pari/spkg-configure.m4 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/pkgs/pari/spkg-configure.m4 b/build/pkgs/pari/spkg-configure.m4 index f638e4bcd2d..e359ff4576e 100644 --- a/build/pkgs/pari/spkg-configure.m4 +++ b/build/pkgs/pari/spkg-configure.m4 @@ -15,6 +15,13 @@ SAGE_SPKG_CONFIGURE([pari], [ AC_MSG_NOTICE([gp is not found]) sage_spkg_install_pari=yes else + AC_PATH_PROG([GPHELP], [gphelp]) dnl needed for cypari2 installation; see #29319 + if test x$GPHELP = x; then + AC_MSG_NOTICE([gphelp is not found; cannot use system pari/GP without gphelp]) + AC_MSG_NOTICE([Install a system package that provides it, possibly pari-doc.]) + AC_MSG_NOTICE([Otherwise Sage will build its own pari/GP.]) + sage_spkg_install_pari=yes + fi AC_MSG_CHECKING([is pari_elldata installed? ]) gp_ell_check=`echo "r=ellinit(\"11a1\"); r[[11]]" | $GP -qf 2>> config.log` if test x$gp_ell_check = x20008; then From 64a028ddc57333d69eacc85e403ed859a92239ec Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 12 Mar 2020 14:15:58 -0400 Subject: [PATCH 2/2] build/pkgs/pari/distros/debian.txt: Add pari-doc --- build/pkgs/pari/distros/debian.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/pkgs/pari/distros/debian.txt b/build/pkgs/pari/distros/debian.txt index 39cd5d363b4..84e2f81b180 100644 --- a/build/pkgs/pari/distros/debian.txt +++ b/build/pkgs/pari/distros/debian.txt @@ -1,3 +1,5 @@ pari-gp2c libpari-dev +# #29319: cypari2 needs gphelp at installation time +pari-doc # We add these data packages because they are checked by spkg-configure.m4 pari-elldata pari-galdata pari-galpol pari-seadata