Update to sagemath 5.13

This commit is contained in:
pcpa 2014-01-29 15:01:17 -02:00
parent b0cc81484c
commit d0a2caf3af
29 changed files with 206 additions and 206 deletions

View file

@ -1,6 +1,6 @@
diff -up sage-5.12/spkg/build/sage-5.12/sage/interfaces/gp.py.orig sage-5.12/spkg/build/sage-5.12/sage/interfaces/gp.py
--- sage-5.12/spkg/build/sage-5.12/sage/interfaces/gp.py.orig 2013-10-16 12:06:10.261189933 -0300
+++ sage-5.12/spkg/build/sage-5.12/sage/interfaces/gp.py 2013-10-16 12:06:21.487190363 -0300
diff -up sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py.orig sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py
--- sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py.orig 2014-01-28 16:06:59.279200475 -0200
+++ sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py 2014-01-28 16:07:36.218201890 -0200
@@ -977,11 +977,11 @@ def is_GpElement(x):
"""
return isinstance(x, GpElement)
@ -16,10 +16,10 @@ diff -up sage-5.12/spkg/build/sage-5.12/sage/interfaces/gp.py.orig sage-5.12/spk
# An instance
gp = Gp(logfile=os.path.join(DOT_SAGE,'gp-expect.log')) # useful for debugging!
diff -up sage-5.12/spkg/build/sage-5.12/sage/libs/pari/gen.pyx.orig sage-5.12/spkg/build/sage-5.12/sage/libs/pari/gen.pyx
--- sage-5.12/spkg/build/sage-5.12/sage/libs/pari/gen.pyx.orig 2013-10-16 12:06:00.720189568 -0300
+++ sage-5.12/spkg/build/sage-5.12/sage/libs/pari/gen.pyx 2013-10-16 12:06:21.498190364 -0300
@@ -183,6 +183,10 @@ include 'sage/ext/python.pxi'
diff -up sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx.orig sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx
--- sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx.orig 2014-01-28 16:07:00.806200534 -0200
+++ sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx 2014-01-28 16:08:42.169204415 -0200
@@ -194,6 +194,10 @@ cdef extern from "misc.h":
cdef extern from "mpz_pylong.h":
cdef int mpz_set_pylong(mpz_t dst, src) except -1
@ -27,19 +27,19 @@ diff -up sage-5.12/spkg/build/sage-5.12/sage/libs/pari/gen.pyx.orig sage-5.12/sp
+ cdef void mp_get_memory_functions(void**, void**, void**)
+ cdef void mp_set_memory_functions(void*, void*, void*)
+
# Make sure we don't use mpz_t_offset before initializing it by
# putting in a value that's likely to provoke a segmentation fault,
# rather than silently corrupting memory.
@@ -9292,7 +9296,12 @@ cdef class PariInstance(sage.structure.p
# Will be imported as needed
Integer = None
@@ -9319,7 +9323,12 @@ cdef class PariInstance(sage.structure.p
# The size here doesn't really matter, because we will allocate
# our own stack anyway. We ask PARI not to set up signal handlers.
# our own stack anyway. We ask PARI not to set up signal and
# error handlers.
+ cdef void *_gmp_malloc
+ cdef void *_gmp_realloc
+ cdef void *_gmp_free
+ mp_get_memory_functions(&_gmp_malloc, &_gmp_realloc, &_gmp_free)
pari_init_opts(10000, maxprime, INIT_JMPm | INIT_DFTm)
pari_init_opts(10000, maxprime, INIT_DFTm)
+ mp_set_memory_functions(_gmp_malloc, _gmp_realloc, _gmp_free)
num_primes = maxprime
# NOTE: pari_catch_sig_on() can only come AFTER pari_init_opts()!
_pari_init_error_handling()