Update to sagemath 8.0

This commit is contained in:
pcpa 2017-11-10 11:26:56 -05:00
parent b78abd5373
commit abc6d11c12
27 changed files with 290 additions and 655 deletions

View file

@ -1,6 +1,6 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2017-04-11 10:01:47.513275219 -0400
+++ src/module_list.py 2017-04-11 10:02:00.105275701 -0400
--- src/module_list.py.orig 2017-11-08 08:30:03.588222687 -0500
+++ src/module_list.py 2017-11-08 08:30:21.532223375 -0500
@@ -62,6 +62,7 @@ linbox_cflags = pkgconfig.cflags('linbox
# Singular
singular_pc = pkgconfig.parse('Singular')
@ -9,7 +9,7 @@ diff -up src/module_list.py.orig src/module_list.py
singular_library_dirs = singular_pc['library_dirs']
singular_cflags = pkgconfig.cflags('Singular').split()
@@ -187,7 +188,8 @@ ext_modules = [
@@ -185,7 +186,8 @@ ext_modules = [
language='c++',
libraries = ["gmp", "m", "ntl"]),
@ -19,7 +19,7 @@ diff -up src/module_list.py.orig src/module_list.py
Extension('sage.algebras.quatalg.quaternion_algebra_cython',
sources = ['sage/algebras/quatalg/quaternion_algebra_cython.pyx'],
@@ -574,7 +576,8 @@ ext_modules = [
@@ -581,7 +583,8 @@ ext_modules = [
[])),
Extension('sage.libs.lrcalc.lrcalc',
@ -27,9 +27,9 @@ diff -up src/module_list.py.orig src/module_list.py
+ sources = ["sage/libs/lrcalc/lrcalc.pyx"],
+ include_dirs = [os.path.join(SAGE_INC, 'lrcalc')]),
Extension('*', ['sage/libs/cypari2/*.pyx']),
Extension('*', ['sage/libs/pari/*.pyx']),
@@ -592,7 +595,8 @@ ext_modules = [
@@ -598,7 +601,8 @@ ext_modules = [
sources = ['sage/libs/readline.pyx'],
libraries = ['readline']),
@ -39,7 +39,7 @@ diff -up src/module_list.py.orig src/module_list.py
Extension('sage.libs.symmetrica.symmetrica',
sources = ["sage/libs/symmetrica/symmetrica.pyx"],
@@ -600,17 +604,21 @@ ext_modules = [
@@ -606,17 +610,21 @@ ext_modules = [
Extension('sage.libs.mpmath.utils',
sources = ["sage/libs/mpmath/utils.pyx"],
@ -65,7 +65,7 @@ diff -up src/module_list.py.orig src/module_list.py
###################################
##
@@ -618,7 +626,8 @@ ext_modules = [
@@ -624,7 +632,8 @@ ext_modules = [
##
###################################
@ -75,7 +75,7 @@ diff -up src/module_list.py.orig src/module_list.py
###################################
##
@@ -799,6 +808,7 @@ ext_modules = [
@@ -805,6 +814,7 @@ ext_modules = [
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
libraries=['arb', 'mpfi', 'mpfr'],
@ -83,7 +83,7 @@ diff -up src/module_list.py.orig src/module_list.py
language = "c++"),
Extension('sage.matrix.matrix_complex_double_dense',
@@ -866,6 +876,7 @@ ext_modules = [
@@ -872,6 +882,7 @@ ext_modules = [
sources = ['sage/matrix/matrix_modn_sparse.pyx']),
Extension('sage.matrix.matrix_mpolynomial_dense',
@ -91,7 +91,7 @@ diff -up src/module_list.py.orig src/module_list.py
sources = ['sage/matrix/matrix_mpolynomial_dense.pyx']),
Extension('sage.matrix.matrix_polynomial_dense',
@@ -1189,6 +1200,7 @@ ext_modules = [
@@ -1201,6 +1212,7 @@ ext_modules = [
Extension("sage.rings.complex_arb",
["sage/rings/complex_arb.pyx"],
libraries=['mpfi', 'mpfr', 'gmp'],
@ -99,7 +99,7 @@ diff -up src/module_list.py.orig src/module_list.py
language = 'c++'),
Extension('sage.rings.complex_double',
@@ -1264,6 +1276,7 @@ ext_modules = [
@@ -1276,6 +1288,7 @@ ext_modules = [
Extension("sage.rings.real_arb",
["sage/rings/real_arb.pyx"],
libraries = ['mpfi', 'mpfr'],
@ -107,7 +107,7 @@ diff -up src/module_list.py.orig src/module_list.py
language = 'c++'),
Extension('sage.rings.real_lazy',
@@ -1462,12 +1475,15 @@ ext_modules = [
@@ -1481,12 +1494,15 @@ ext_modules = [
sources = ['sage/rings/polynomial/multi_polynomial.pyx']),
Extension('sage.rings.polynomial.multi_polynomial_ideal_libsingular',
@ -123,7 +123,7 @@ diff -up src/module_list.py.orig src/module_list.py
sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx']),
Extension('sage.rings.polynomial.multi_polynomial_ring_generic',
@@ -1481,6 +1497,7 @@ ext_modules = [
@@ -1500,6 +1516,7 @@ ext_modules = [
Extension('sage.rings.polynomial.polynomial_complex_arb',
sources = ['sage/rings/polynomial/polynomial_complex_arb.pyx'],
@ -132,13 +132,13 @@ diff -up src/module_list.py.orig src/module_list.py
Extension('sage.rings.polynomial.polynomial_compiled',
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig 2017-04-11 10:01:57.270275593 -0400
+++ src/setup.py 2017-04-11 10:02:00.107275701 -0400
@@ -83,6 +83,7 @@ except KeyError:
--- src/setup.py.orig 2017-11-08 08:30:03.589222688 -0500
+++ src/setup.py 2017-11-08 08:30:21.533223375 -0500
@@ -89,6 +89,7 @@ except KeyError:
# search for dependencies and add to gcc -I<path>
# this depends on SAGE_CYTHONIZED
include_dirs = sage_include_directories(use_sources=True)
+include_dirs.extend(['@@CYSIGNALS@@'])
# Manually add -fno-strict-aliasing, which is needed to compile Cython
# and disappears from the default flags if the user has set CFLAGS.
# Look for libraries in $SAGE_LOCAL/lib
library_dirs = [os.path.join(SAGE_LOCAL, "lib")]