Ticket #9860: pari.p5.patch

SPKG.txt

@@ -83 +83 @@
 
 == Changelog ==
 
-=== pari-2.4.3.svn-12577.p5 (Leif Leonhardy, September 5th, 2010) ===
+=== pari-2.4.3.svn-12577.p5 (Leif Leonhardy, Jeroen Demeyer, September 5th, 2010) ===
  * Added patches to:
    - config/get_config_options:
      * Make invalid arguments to "--graphic" a "Configure" error
@@ -123 +123 @@
    - Some clean-up.
  * Slight corrections to SPKG.txt.
  * Updated patches/README.txt, some cosmetic changes.
+ * Remove patch for config/Makefile.SH and add upstream fix instead
+   in spkg-make.
+ * Add upstream fix for src/test/tune.c which should fix tuning.
+ * Add -O0 to CFLAGS in spkg-make to speed up compiling (the output of
+   the compiling is not used anyway).
 
 === pari-2.4.3.svn-12577.p4 (Jeroen Demeyer, August 22, 2010) ===
  * Change "test -e" to "test -f" for Solaris.

deleted file patches/Makefile.SH.patch

@@ -1 @@
-Index: config/Makefile.SH
-===================================================================
---- config/Makefile.SH  (revision 12583)
-+++ config/Makefile.SH  (working copy)
-@@ -599,9 +599,9 @@
- EOT
- fi
- 
--if test -e $TOP/.svn/entries; then
-+if test -f "$TOP/.svn/entries"; then
-   vcfile="../.svn/entries"
--else if test -e $TOP/.git/index; then
-+else if test -f "$TOP/.git/index"; then
-   vcfile="../.git/index"
-   fi
- fi

patches/README.txt

@@ -7 +7 @@
 ======================================================================
 
 Configuration files:
-* Configure: Use "#!/usr/bin/env bash" instead of "#!/bin/sh".
+* Configure: Use "#!/usr/bin/env bash" instead of "#!/bin/sh".  Note
+  that this is not strictly necessary, but it hopefully makes the
+  script less system-dependent. Since Sage assumes the existence of
+  bash anyway, it doesn't hurt either. -- Jeroen Demeyer
 * config/get_ld: cwitty: Disable -rpath.
 * config/get_tests: John Cremona: Disable testing of ellglobalred in
                     "make test-all" in spkg-check, since it requires
                     the elldata database which we do not include.
 * config/get_dlcflags: Add -fno-common to DLCFLAGS on Darwin.
-* config/Makefile.SH: Change "test -e" to "test -f" for Solaris.
 * config/get_config_options: Catch invalid arguments tp "--graphic".
 * config/get_fltk; Add libstdc++; check presence of FLTK headers, too.
 * config/get_X11: Search X11 library in */lib64/*, too (not just */lib/*).
@@ -63 +65 @@
 * src/headers/paripriv.h: Used to need a dummy variable changed from B0
   to N; now fixed upstream.  NB: There's another patch on this file still
   in place!
-
+* config/Makefile.SH: Change "test -e" to "test -f" for Solaris.  Fixed
+  upstream

patches/mp.c.patch

@@ -15 +15 @@
  /* EXACT INTEGER DIVISION */
  
 -#if 1 /* use undocumented GMP interface */
-+#ifndef PARI_DONT_USE_GMP_INTERNALS /* use "undocumented" GMP interface: */
++#ifndef PARI_DONT_USE_GMP_INTERNALS /* Use GMP/MPIR internals */
 +/* 
-+ * Note: "Undocumented" refers to directly accessing ("private") members
-+ *       of GMP's mpz_t / __mpz_struct types, which are defined in gmp.h.
++ * Note: This refers to directly accessing ("private") members of
++ *       GMP's mpz_t / __mpz_struct types, which are defined in gmp.h.
 + *       This is in fact (at least) compatible with both
 + *        - GMP (<= 5.0.1) *and*
 + *        - MPIR (<= 2.1.2),
@@ -33 +33 @@
    }
  }
 -#else
-+#else /* don't use "undocumented" GMP interface: */
++#else /* Don't use GMP/MPIR internals */
  /* assume y != 0 and the division is exact */
  GEN
  diviuexact(GEN x, ulong y)

spkg-install

@@ -45 +45 @@
 # Add -fno-common to DLCFLAGS on Darwin (for Mac OS X 10.4, "Tiger"):
 cp "$PATCHED/get_dlcflags" config/
 
-# Two configure patches for Solaris:
+# Use bash for Configure instead of /bin/sh
 cp "$PATCHED/Configure" .
-cp "$PATCHED/Makefile.SH" config/
 
 # leif: Catch invalid arguments to "--graphic" (and treat such as an error)
 # since otherwise strange compilation errors might occur (cf. #9722, too).
@@ -150 +149 @@
 
     # Allow the user to enable PARI self-tuning.
     # This is time-consuming, but some may want to do it.
-    # It is also very unreliable, and currently (svn 12577) completely
-    # broken on *many* systems.
     # Comment by leif: Also, PARI's Configure calls "make" (instead of $MAKE)
     #                  if we do tuning, so:
     #            TODO: Replace that in our patched version of Configure!

spkg-make

@@ -61 +61 @@
 cd parisvn
 svn update -r 12577
 
+# Patch config/Makefile.SH (for Solaris)
+svn update -r 12588 config/Makefile.SH
 
-# make pari (must run bison, etc...)
-./Configure || exit
+# Patch src/test/tune.c (fix tuning)
+svn update -r 12588 src/test/tune.c
+
+
+# make pari (must run bison, etc...) but disable optimization to speed
+# up compilation (the output of the compiling is not used anyway).
+env CFLAGS="-O0" ./Configure || exit
 make gp doc || exit