zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 7.5.1

Browse source
This commit is contained in:
pcpa 2017-04-06 08:02:52 -04:00
parent ac3aa7f6b7
commit 056e08d023
24 changed files with 481 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

137
sagemath-includes.patch
View file

@ -1,35 +1,25 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2016-10-20 08:21:43.948569459 -0400
+++ src/module_list.py 2016-10-20 08:28:34.226585170 -0400
@@ -116,6 +116,7 @@ except ValueError:
#########################################################
singular_libs = ['singular', 'flint', 'ntl', 'gmpxx', 'gmp', 'readline', 'm']
--- src/module_list.py.orig 2017-03-29 18:42:35.820001764 -0400
+++ src/module_list.py 2017-03-29 18:43:56.158004841 -0400
@@ -63,6 +63,7 @@ linbox_cflags = pkgconfig.cflags('linbox
# Singular
singular_pc = pkgconfig.parse('Singular')
singular_libs = singular_pc['libraries']
+singular_incs = [SAGE_INC + '/singular', SAGE_INC + '/factory']
singular_library_dirs = singular_pc['library_dirs']
singular_cflags = pkgconfig.cflags('Singular').split()
#########################################################
### Library order
@@ -192,16 +193,19 @@ ext_modules = [
Extension('sage.algebras.letterplace.free_algebra_letterplace',
sources = ['sage/algebras/letterplace/free_algebra_letterplace.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
@@ -188,7 +189,8 @@ ext_modules = [
language='c++',
libraries = ["gmp", "m", "ntl"]),
Extension('sage.algebras.letterplace.free_algebra_element_letterplace',
sources = ['sage/algebras/letterplace/free_algebra_element_letterplace.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
Extension('sage.algebras.letterplace.letterplace_ideal',
sources = ['sage/algebras/letterplace/letterplace_ideal.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
- Extension('*', sources = ['sage/algebras/letterplace/*.pyx']),
+ Extension('*', sources = ['sage/algebras/letterplace/*.pyx'],
+ include_dirs = singular_incs),
Extension('sage.algebras.quatalg.quaternion_algebra_cython',
@@ -644,7 +648,8 @@ ext_modules = [
sources = ['sage/algebras/quatalg/quaternion_algebra_cython.pyx'],
@@ -607,7 +609,8 @@ ext_modules = [
[])),
Extension('sage.libs.lrcalc.lrcalc',
@ -37,47 +27,19 @@ 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.pari.closure',
sources = ["sage/libs/pari/closure.pyx"]),
@@ -677,31 +682,37 @@ ext_modules = [
Extension('sage.libs.singular.singular',
sources = ['sage/libs/singular/singular.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
Extension('*', ['sage/libs/cypari2/*.pyx']),
Extension('*', ['sage/libs/pari/*.pyx']),
@@ -625,7 +628,8 @@ ext_modules = [
sources = ['sage/libs/readline.pyx'],
libraries = ['readline']),
Extension('sage.libs.singular.polynomial',
sources = ['sage/libs/singular/polynomial.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
Extension('sage.libs.singular.ring',
sources = ['sage/libs/singular/ring.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
Extension('sage.libs.singular.groebner_strategy',
sources = ['sage/libs/singular/groebner_strategy.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
Extension('sage.libs.singular.function',
sources = ['sage/libs/singular/function.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
Extension('sage.libs.singular.option',
sources = ['sage/libs/singular/option.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
- Extension('*', sources = ['sage/libs/singular/*.pyx']),
+ Extension('*', sources = ['sage/libs/singular/*.pyx'],
+ include_dirs = singular_incs),
Extension('sage.libs.symmetrica.symmetrica',
@@ -710,17 +721,21 @@ ext_modules = [
sources = ["sage/libs/symmetrica/symmetrica.pyx"],
@@ -633,17 +637,21 @@ ext_modules = [
Extension('sage.libs.mpmath.utils',
sources = ["sage/libs/mpmath/utils.pyx"],
@ -103,7 +65,7 @@ diff -up src/module_list.py.orig src/module_list.py
###################################
##
@@ -728,7 +743,8 @@ ext_modules = [
@@ -651,7 +659,8 @@ ext_modules = [
##
###################################
@ -113,24 +75,23 @@ diff -up src/module_list.py.orig src/module_list.py
###################################
##
@@ -901,7 +917,7 @@ ext_modules = [
@@ -824,6 +833,7 @@ ext_modules = [
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
libraries=['arb', 'mpfi', 'mpfr'],
- include_dirs=[SAGE_INC + '/flint'],
+ include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
language = "c++"),
Extension('sage.matrix.matrix_complex_double_dense',
@@ -971,6 +987,7 @@ ext_modules = [
@@ -891,6 +901,7 @@ ext_modules = [
sources = ['sage/matrix/matrix_modn_sparse.pyx']),
Extension('sage.matrix.matrix_mpolynomial_dense',
sources = ['sage/matrix/matrix_mpolynomial_dense.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
sources = ['sage/matrix/matrix_mpolynomial_dense.pyx']),
Extension('sage.matrix.matrix_rational_dense',
@@ -1288,6 +1305,7 @@ ext_modules = [
@@ -1203,6 +1214,7 @@ ext_modules = [
Extension("sage.rings.complex_arb",
["sage/rings/complex_arb.pyx"],
libraries=['mpfi', 'mpfr', 'gmp'],
@ -138,7 +99,7 @@ diff -up src/module_list.py.orig src/module_list.py
language = 'c++'),
Extension('sage.rings.complex_double',
@@ -1360,6 +1378,7 @@ ext_modules = [
@@ -1275,6 +1287,7 @@ ext_modules = [
Extension("sage.rings.real_arb",
["sage/rings/real_arb.pyx"],
libraries = ['mpfi', 'mpfr'],
@ -146,30 +107,34 @@ diff -up src/module_list.py.orig src/module_list.py
language = 'c++'),
Extension('sage.rings.real_lazy',
@@ -1564,16 +1583,19 @@ ext_modules = [
@@ -1473,12 +1486,15 @@ ext_modules = [
sources = ['sage/rings/polynomial/multi_polynomial.pyx']),
Extension('sage.rings.polynomial.multi_polynomial_ideal_libsingular',
sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx']),
Extension('sage.rings.polynomial.plural',
sources = ['sage/rings/polynomial/plural.pyx'],
libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'],
+ include_dirs = singular_incs,
language="c++"),
sources = ['sage/rings/polynomial/plural.pyx']),
Extension('sage.rings.polynomial.multi_polynomial_libsingular',
sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx'],
libraries = singular_libs,
+ include_dirs = singular_incs,
language="c++"),
sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx']),
Extension('sage.rings.polynomial.multi_polynomial_ring_generic',
@@ -1492,6 +1508,7 @@ ext_modules = [
Extension('sage.rings.polynomial.polynomial_complex_arb',
sources = ['sage/rings/polynomial/polynomial_complex_arb.pyx'],
+ include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
language="c++"),
Extension('sage.rings.polynomial.polynomial_compiled',
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig 2016-10-20 08:28:56.912586039 -0400
+++ src/setup.py 2016-10-20 08:29:26.634587177 -0400
@@ -78,6 +78,7 @@ except KeyError:
--- src/setup.py.orig 2017-03-29 18:42:34.196001702 -0400
+++ src/setup.py 2017-03-29 18:42:39.088001890 -0400
@@ -83,6 +83,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)