mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.2.
Also: - Create the sagemath-data-combinatorial_designs subpackage. - Create the sagemath-notebook-export subpackage. - Unbundle the LaTeX makecmds style. - Install LaTeX style files in a more canonical place.
This commit is contained in:
Jerry James
parent
b46cd4759a
commit
925e91dade
28 changed files with 743 additions and 795 deletions
|
|
@ -1,15 +1,32 @@
|
|||
diff -up src/module_list.py.orig src/module_list.py
|
||||
--- 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')
|
||||
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()
|
||||
--- src/module_list.py.orig 2018-05-22 15:41:19.892745329 -0600
|
||||
+++ src/module_list.py 2018-05-22 15:42:40.289863491 -0600
|
||||
@@ -45,6 +45,9 @@ zlib_libs = zlib_pc['libraries']
|
||||
zlib_library_dirs = zlib_pc['library_dirs']
|
||||
zlib_include_dirs = zlib_pc['include_dirs']
|
||||
|
||||
@@ -185,7 +186,8 @@ ext_modules = [
|
||||
+# Singular
|
||||
+singular_incs = [SAGE_INC + '/singular', SAGE_INC + '/factory']
|
||||
+
|
||||
#########################################################
|
||||
### M4RI flags
|
||||
#########################################################
|
||||
@@ -61,6 +64,14 @@ except ValueError:
|
||||
pass
|
||||
|
||||
#########################################################
|
||||
+### ARB flags
|
||||
+#########################################################
|
||||
+
|
||||
+arb_include_dirs = [os.path.join(SAGE_INC, 'flint'),
|
||||
+ os.path.join(SAGE_INC, 'arb')]
|
||||
+arb_libs = ['arb']
|
||||
+
|
||||
+#########################################################
|
||||
### Library order
|
||||
#########################################################
|
||||
|
||||
@@ -134,7 +145,8 @@ ext_modules = [
|
||||
language='c++',
|
||||
libraries = ["gmp", "m", "ntl"]),
|
||||
|
||||
|
|
@ -17,9 +34,9 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
+ Extension('*', sources = ['sage/algebras/letterplace/*.pyx'],
|
||||
+ include_dirs = singular_incs),
|
||||
|
||||
Extension('sage.algebras.quatalg.quaternion_algebra_cython',
|
||||
sources = ['sage/algebras/quatalg/quaternion_algebra_cython.pyx'],
|
||||
@@ -581,7 +583,8 @@ ext_modules = [
|
||||
Extension('*', sources = ['sage/algebras/finite_dimensional_algebras/*.pyx']),
|
||||
|
||||
@@ -519,7 +531,8 @@ ext_modules = [
|
||||
[])),
|
||||
|
||||
Extension('sage.libs.lrcalc.lrcalc',
|
||||
|
|
@ -27,9 +44,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/pari/*.pyx']),
|
||||
|
||||
@@ -598,7 +601,8 @@ ext_modules = [
|
||||
OptionalExtension("sage.libs.meataxe",
|
||||
sources = ['sage/libs/meataxe.pyx'],
|
||||
@@ -541,23 +554,28 @@ ext_modules = [
|
||||
sources = ['sage/libs/readline.pyx'],
|
||||
libraries = ['readline']),
|
||||
|
||||
|
|
@ -39,18 +56,16 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
|
||||
Extension('sage.libs.symmetrica.symmetrica',
|
||||
sources = ["sage/libs/symmetrica/symmetrica.pyx"],
|
||||
@@ -606,17 +610,21 @@ ext_modules = [
|
||||
libraries = ["symmetrica"]),
|
||||
|
||||
Extension('sage.libs.mpmath.utils',
|
||||
sources = ["sage/libs/mpmath/utils.pyx"],
|
||||
- libraries = ['mpfr']),
|
||||
+ libraries = ['mpfr'],
|
||||
- sources = ["sage/libs/mpmath/utils.pyx"]),
|
||||
+ sources = ["sage/libs/mpmath/utils.pyx"],
|
||||
+ include_dirs = [os.path.join(SAGE_INC, "flint")]),
|
||||
|
||||
Extension('sage.libs.mpmath.ext_impl',
|
||||
sources = ["sage/libs/mpmath/ext_impl.pyx"],
|
||||
- libraries = ['mpfr']),
|
||||
+ libraries = ['mpfr'],
|
||||
- sources = ["sage/libs/mpmath/ext_impl.pyx"]),
|
||||
+ sources = ["sage/libs/mpmath/ext_impl.pyx"],
|
||||
+ include_dirs = [os.path.join(SAGE_INC, "flint")]),
|
||||
|
||||
Extension('sage.libs.mpmath.ext_main',
|
||||
|
|
@ -65,25 +80,35 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
|
||||
###################################
|
||||
##
|
||||
@@ -624,7 +632,8 @@ ext_modules = [
|
||||
@@ -565,7 +583,8 @@ ext_modules = [
|
||||
##
|
||||
###################################
|
||||
|
||||
- Extension('*', ["sage/libs/arb/*.pyx"]),
|
||||
+ Extension('*', ["sage/libs/arb/*.pyx"],
|
||||
+ include_dirs = [SAGE_INC + '/flint', SAGE_INC + '/arb']),
|
||||
+ include_dirs = arb_include_dirs),
|
||||
|
||||
###################################
|
||||
##
|
||||
@@ -805,6 +814,7 @@ ext_modules = [
|
||||
@@ -745,7 +764,8 @@ 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', SAGE_INC + '/arb'],
|
||||
language = "c++"),
|
||||
- libraries=['arb']),
|
||||
+ include_dirs = arb_include_dirs,
|
||||
+ libraries=arb_libs),
|
||||
|
||||
Extension('sage.matrix.matrix_complex_double_dense',
|
||||
@@ -872,6 +882,7 @@ ext_modules = [
|
||||
sources = ['sage/matrix/matrix_complex_double_dense.pyx']),
|
||||
@@ -753,6 +773,7 @@ ext_modules = [
|
||||
Extension('sage.matrix.matrix_cyclo_dense',
|
||||
sources = ['sage/matrix/matrix_cyclo_dense.pyx'],
|
||||
language = "c++",
|
||||
+ include_dirs = arb_include_dirs,
|
||||
libraries=['ntl']),
|
||||
|
||||
Extension('sage.matrix.matrix_gap',
|
||||
@@ -815,6 +836,7 @@ ext_modules = [
|
||||
sources = ['sage/matrix/matrix_modn_sparse.pyx']),
|
||||
|
||||
Extension('sage.matrix.matrix_mpolynomial_dense',
|
||||
|
|
@ -91,23 +116,35 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
sources = ['sage/matrix/matrix_mpolynomial_dense.pyx']),
|
||||
|
||||
Extension('sage.matrix.matrix_polynomial_dense',
|
||||
@@ -1201,6 +1212,7 @@ ext_modules = [
|
||||
Extension("sage.rings.complex_arb",
|
||||
["sage/rings/complex_arb.pyx"],
|
||||
libraries=['mpfi', 'mpfr', 'gmp'],
|
||||
+ include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
|
||||
@@ -1112,7 +1134,8 @@ ext_modules = [
|
||||
language = 'c++'),
|
||||
|
||||
Extension("sage.rings.complex_arb",
|
||||
- ["sage/rings/complex_arb.pyx"]),
|
||||
+ ["sage/rings/complex_arb.pyx"],
|
||||
+ include_dirs = arb_include_dirs),
|
||||
|
||||
Extension('sage.rings.complex_double',
|
||||
@@ -1276,6 +1288,7 @@ ext_modules = [
|
||||
sources = ['sage/rings/complex_double.pyx'],
|
||||
@@ -1182,7 +1205,8 @@ ext_modules = [
|
||||
sources = ['sage/rings/real_interval_absolute.pyx']),
|
||||
|
||||
Extension("sage.rings.real_arb",
|
||||
["sage/rings/real_arb.pyx"],
|
||||
libraries = ['mpfi', 'mpfr'],
|
||||
+ include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
|
||||
language = 'c++'),
|
||||
- ["sage/rings/real_arb.pyx"]),
|
||||
+ ["sage/rings/real_arb.pyx"],
|
||||
+ include_dirs = arb_include_dirs),
|
||||
|
||||
Extension('sage.rings.real_lazy',
|
||||
@@ -1481,12 +1494,15 @@ ext_modules = [
|
||||
sources = ['sage/rings/real_lazy.pyx']),
|
||||
@@ -1265,6 +1289,7 @@ ext_modules = [
|
||||
|
||||
Extension('sage.rings.number_field.number_field_element_quadratic',
|
||||
sources = ['sage/rings/number_field/number_field_element_quadratic.pyx'],
|
||||
+ include_dirs = arb_include_dirs,
|
||||
libraries=['ntl'],
|
||||
language = 'c++'),
|
||||
|
||||
@@ -1387,12 +1412,15 @@ ext_modules = [
|
||||
sources = ['sage/rings/polynomial/multi_polynomial.pyx']),
|
||||
|
||||
Extension('sage.rings.polynomial.multi_polynomial_ideal_libsingular',
|
||||
|
|
@ -123,20 +160,22 @@ 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',
|
||||
@@ -1500,6 +1516,7 @@ ext_modules = [
|
||||
@@ -1405,7 +1433,8 @@ ext_modules = [
|
||||
sources = ['sage/rings/polynomial/polydict.pyx']),
|
||||
|
||||
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++"),
|
||||
- sources = ['sage/rings/polynomial/polynomial_complex_arb.pyx']),
|
||||
+ sources = ['sage/rings/polynomial/polynomial_complex_arb.pyx'],
|
||||
+ include_dirs = arb_include_dirs),
|
||||
|
||||
Extension('sage.rings.polynomial.polynomial_compiled',
|
||||
sources = ['sage/rings/polynomial/polynomial_compiled.pyx']),
|
||||
diff -up src/setup.py.orig src/setup.py
|
||||
--- 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:
|
||||
--- src/setup.py.orig 2018-05-22 15:41:19.893745318 -0600
|
||||
+++ src/setup.py 2018-05-22 15:41:27.805658536 -0600
|
||||
@@ -85,6 +85,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@@'])
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue