Ticket #11321: trac_11321-reviewer_part2-support_older_PARI-improve_doc.spkg.patch

SPKG.txt

@@ -30 +30 @@
 
 == Special Update/Build Instructions ==
 
- * There is some garbage in the upstream sources:
+ * There is some garbage in the upstream sources which should be removed:
      src/include/.Lexplicit_formula.h.swp
      src/include/.Lvalue.h.swp
      src/include/._.DS_Store
@@ -44 +44 @@
      src/src/.Lcommandline.ggo.swp
      src/src/libLfunction.a
  * Make sure the patches still apply cleanly.
+ * We (and apparently also upstream) currently don't build Lcalc's tests
+   (see Makefile), hence there's no spkg-check.
+   This might change in newer upstream versions.
  * TODO / FIXME:
    The (upstream) Makefile uses $(CC) to compile C++ (also using $(CCFLAGS)),
    which it defines to 'g++', and hardcodes 'g++' when linking the shared
@@ -70 +73 @@
    - use $(MAKE) instead of 'make' in the crude build receipts,
    - use CXXFLAG64 when linking the shared library.
  * pari-2.4.4.patch: 
-   Use allocatemem() instead of allocatemoremem() which the new PARI no
-   longer supports. (The former isn't supported by older versions of PARI
-   though; cf. #11321.)
+   (Patches src/src/Lcommandline.cc and src/src/Lcommandline_elliptic.cc.)
+   Use allocatemem() instead of allocatemoremem() if PARI version >= 2.4.4
+   because the newer PARI versions no longer support the latter.
+   (The former function isn't supported by older versions of PARI though,
+   therefore we use conditional compilation for that; cf. #11321.)
+   The part which patches Lcommandline_elliptic.cc does not really depend on
+   the PARI version 2.4.4; it was introduced by #9592 when we upgraded PARI
+   to 2.4.3 [svn-12577], see also #9343.
+   (That part of the patch replaces lgeti() by (long)cgeti().)
  * time.h.patch:
+   (Patches src/include/Lcommandline_numbertheory.h.)
    Include also <time.h> in Lcommandline_numbertheory.h (at least required
    on Cygwin, cf. #9845).
    This should get reported upstream.

patches/pari-2.4.4.patch

@@ -1 @@
---- src/src/Lcommandline.cc     2010-01-31 16:16:45.000000000 +0100
-+++ src/src/Lcommandline.cc     2011-05-10 17:22:10.000000000 +0200
+--- src/src/Lcommandline.cc     2009-02-25 08:32:44.000000000 +0100
++++ patches/Lcommandline.cc     2011-07-30 04:14:38.000000000 +0200
 @@ -31,6 +31,12 @@
  #include "Lcommandline.h"
  #include "cmdline.h"
  
 +/* No-operation error recovery routine for PARI.  This is needed for
-+ * allocatemem(), which calls the error recovery routine (because
-+ * allocatemem() destroys the PARI stack).
++ * PARI >=2.4.4's allocatemem(), which calls the error recovery routine
++ * (because allocatemem() destroys the PARI stack).
 + */
 +void pari_err_recover_nop(long errnum) {return;}
 +
  int main (int argc, char *argv[])
  {
  
-@@ -473,7 +479,13 @@
+@@ -473,7 +479,31 @@
  
  #ifdef INCLUDE_PARI
          if(do_elliptic_curve){
--             allocatemoremem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
-+             /* allocatemem() calls the callback function cb_pari_err_recover(),
-+              * which we temporarily change to do nothing. */
++
++#if    !defined(PARI_VERSION_CODE) || !defined(PARI_VERSION)
++#error "PARI_VERSION() and/or PARI_VERSION_CODE not defined. \
++(These should come from paricfg.h, included by pari.h.)"
++#endif
++
++#if    PARI_VERSION_CODE >= PARI_VERSION(2,4,4)
++
++             /* PARI >= 2.4.4 no longer supports allocatemoremem(),
++              * but provides allocatemem() instead. 
++              *
++              * allocatemem() calls the callback function cb_pari_err_recover(),
++              * which we temporarily change to do nothing.
++              */
 +             void (*saved_err_recover)(long) = cb_pari_err_recover;
 +             cb_pari_err_recover = pari_err_recover_nop;
 +             allocatemem(N_terms*16 + 1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
 +             cb_pari_err_recover = saved_err_recover;
 +
++#else  // PARI version < 2.4.4
++
+              allocatemoremem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
++
++#endif
++
               if (my_verbose>0) cout << "Will precompute " << N_terms << " elliptic L-function dirichlet coefficients..." << endl;
               initialize_new_L(a1,a2,a3,a4,a6,N_terms); 
          }
---- src/src/Lcommandline_elliptic.cc    2010-01-31 16:16:45.000000000 +0100
-+++ src/src/Lcommandline_elliptic.cc    2011-05-10 17:08:10.000000000 +0200
+--- src/src/Lcommandline_elliptic.cc    2008-09-17 05:41:06.000000000 +0200
++++ patches/Lcommandline_elliptic.cc    2011-07-30 04:18:12.000000000 +0200
 @@ -121,11 +121,11 @@