[lcalc] 01/02: Fixed #776802

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository lcalc.

commit dd128fa74f298ee6edd4fdd559e48d706c7bae39
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Mon Feb 2 11:08:10 2015 +0100

    Fixed #776802
---
 debian/changelog                |  6 +++++-
 debian/control                  |  2 +-
 debian/patches/init_stack.patch | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b41a93..1eb5a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 lcalc (1.23+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Tobias Hansen ]
   * Fix FTBFS with gcc-4.9. (Closes: #746867)
   * With pari_2.7.patch the package build-depends now on pari >= 2.7
     instead of >= 2.5. (Closes: #746048)
 
- -- Tobias Hansen <thansen at debian.org>  Sun, 18 May 2014 01:34:21 +0200
+  [ Julien Puydt ]
+  * Added a patch to allocate a bigger PARI stack. (Closes: #776802)
+
+ -- Julien Puydt <julien.puydt at laposte.net>  Mon, 02 Feb 2015 11:06:33 +0100
 
 lcalc (1.23+dfsg-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 29bc1dd..62bb7c2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: lcalc
 Section: math
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Tobias Hansen <thansen at debian.org>
+Uploaders: Tobias Hansen <thansen at debian.org>, Julien Puydt <julien.puydt at laposte.net>
 Build-Depends: debhelper (>= 9), libpari-dev (>= 2.7)
 Homepage: http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html
 Standards-Version: 3.9.5
diff --git a/debian/patches/init_stack.patch b/debian/patches/init_stack.patch
new file mode 100644
index 0000000..e686c88
--- /dev/null
+++ b/debian/patches/init_stack.patch
@@ -0,0 +1,35 @@
+Description: Make Lcalc allocate a larger PARI stack
+Author: Julien Puydt <julien.puydt at laposte.net>
+Date: Mon, 2 Feb 2015 11:00:00 +0100
+Bug-Debian: http://bugs.debian.org/776802
+
+diff --git a/include/Lcommandline.h b/include/Lcommandline.h
+index 9562055..ab1f171 100644
+--- a/include/Lcommandline.h
++++ b/include/Lcommandline.h
+@@ -40,11 +40,7 @@
+ #include "Lcommandline_globals.h"      //command line global variables
+ #ifdef INCLUDE_PARI
+ #include "pari/pari.h"     //for pari's elliptic curve functions
+-#undef init                //pari has a '#define init pari_init' which
+-                           //causes trouble with the stream.h init.
+-                           //pari also causes trouble with things like abs.
+-                           //we place the pari include first since otherwise it
+-                           //messes up.
++#include "pari/paripriv.h" // for pari_init_stack
+ 
+ #endif //ifdef INCLUDE_PARI
+ 
+diff --git a/src/Lcommandline.cc b/src/Lcommandline.cc
+index 35efb9d..5beba86 100644
+--- a/src/Lcommandline.cc
++++ b/src/Lcommandline.cc
+@@ -473,7 +473,7 @@ int main (int argc, char *argv[])
+ 
+ #ifdef INCLUDE_PARI
+         if(do_elliptic_curve){
+-             allocatemem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
++             pari_init_stack((size_t)N_terms*16 + 1000000, top-bot); // Allocate bigger PARI stack
+              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); 
+         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lcalc.git