mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
1a0bd1afc6
Also: - Drop -lrslib, -gap-hap, and -flask patches. - Drop obsolete scriplets to fix F24 to F25 upgrade (bz 1594429 and 1618934). - Drop obsolete mktexlsr invocations. - Fix more Singular paths. - Fix still more uses of /usr/bin/env. - Drop disallow/dissallow fixup for cython; now fixed in cython itself.
183 lines
7.2 KiB
Diff
183 lines
7.2 KiB
Diff
diff -up src/module_list.py.orig src/module_list.py
|
|
--- src/module_list.py.orig 2018-08-29 10:41:05.127643255 -0600
|
|
+++ src/module_list.py 2018-08-29 10:44:16.376279329 -0600
|
|
@@ -45,6 +45,9 @@ zlib_libs = zlib_pc['libraries']
|
|
zlib_library_dirs = zlib_pc['library_dirs']
|
|
zlib_include_dirs = zlib_pc['include_dirs']
|
|
|
|
+# 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"]),
|
|
|
|
- Extension('*', sources = ['sage/algebras/letterplace/*.pyx']),
|
|
+ Extension('*', sources = ['sage/algebras/letterplace/*.pyx'],
|
|
+ include_dirs = singular_incs),
|
|
|
|
Extension('*', sources = ['sage/algebras/finite_dimensional_algebras/*.pyx']),
|
|
|
|
@@ -526,7 +538,8 @@ ext_modules = [
|
|
[])),
|
|
|
|
Extension('sage.libs.lrcalc.lrcalc',
|
|
- sources = ["sage/libs/lrcalc/lrcalc.pyx"]),
|
|
+ sources = ["sage/libs/lrcalc/lrcalc.pyx"],
|
|
+ include_dirs = [os.path.join(SAGE_INC, 'lrcalc')]),
|
|
|
|
OptionalExtension("sage.libs.meataxe",
|
|
sources = ['sage/libs/meataxe.pyx'],
|
|
@@ -548,23 +561,28 @@ ext_modules = [
|
|
sources = ['sage/libs/readline.pyx'],
|
|
libraries = ['readline']),
|
|
|
|
- Extension('*', sources = ['sage/libs/singular/*.pyx']),
|
|
+ Extension('*', sources = ['sage/libs/singular/*.pyx'],
|
|
+ include_dirs = singular_incs),
|
|
|
|
Extension('sage.libs.symmetrica.symmetrica',
|
|
sources = ["sage/libs/symmetrica/symmetrica.pyx"],
|
|
libraries = ["symmetrica"]),
|
|
|
|
Extension('sage.libs.mpmath.utils',
|
|
- 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"]),
|
|
+ sources = ["sage/libs/mpmath/ext_impl.pyx"],
|
|
+ include_dirs = [os.path.join(SAGE_INC, "flint")]),
|
|
|
|
Extension('sage.libs.mpmath.ext_main',
|
|
- sources = ["sage/libs/mpmath/ext_main.pyx"]),
|
|
+ sources = ["sage/libs/mpmath/ext_main.pyx"],
|
|
+ include_dirs = [os.path.join(SAGE_INC, "flint")]),
|
|
|
|
Extension('sage.libs.mpmath.ext_libmp',
|
|
- sources = ["sage/libs/mpmath/ext_libmp.pyx"]),
|
|
+ sources = ["sage/libs/mpmath/ext_libmp.pyx"],
|
|
+ include_dirs = [os.path.join(SAGE_INC, "flint")]),
|
|
|
|
###################################
|
|
##
|
|
@@ -572,7 +590,8 @@ ext_modules = [
|
|
##
|
|
###################################
|
|
|
|
- Extension('*', ["sage/libs/arb/*.pyx"]),
|
|
+ Extension('*', ["sage/libs/arb/*.pyx"],
|
|
+ include_dirs = arb_include_dirs),
|
|
|
|
###################################
|
|
##
|
|
@@ -744,7 +763,8 @@ ext_modules = [
|
|
|
|
Extension("sage.matrix.matrix_complex_ball_dense",
|
|
["sage/matrix/matrix_complex_ball_dense.pyx"],
|
|
- libraries=['arb']),
|
|
+ include_dirs = arb_include_dirs,
|
|
+ libraries=arb_libs),
|
|
|
|
Extension('sage.matrix.matrix_complex_double_dense',
|
|
sources = ['sage/matrix/matrix_complex_double_dense.pyx']),
|
|
@@ -752,6 +772,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',
|
|
@@ -814,6 +835,7 @@ ext_modules = [
|
|
sources = ['sage/matrix/matrix_modn_sparse.pyx']),
|
|
|
|
Extension('sage.matrix.matrix_mpolynomial_dense',
|
|
+ include_dirs = singular_incs,
|
|
sources = ['sage/matrix/matrix_mpolynomial_dense.pyx']),
|
|
|
|
Extension('sage.matrix.matrix_polynomial_dense',
|
|
@@ -1111,7 +1133,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',
|
|
sources = ['sage/rings/complex_double.pyx'],
|
|
@@ -1181,7 +1204,8 @@ ext_modules = [
|
|
sources = ['sage/rings/real_interval_absolute.pyx']),
|
|
|
|
Extension("sage.rings.real_arb",
|
|
- ["sage/rings/real_arb.pyx"]),
|
|
+ ["sage/rings/real_arb.pyx"],
|
|
+ include_dirs = arb_include_dirs),
|
|
|
|
Extension('sage.rings.real_lazy',
|
|
sources = ['sage/rings/real_lazy.pyx']),
|
|
@@ -1264,6 +1288,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++'),
|
|
|
|
@@ -1386,12 +1411,15 @@ ext_modules = [
|
|
sources = ['sage/rings/polynomial/multi_polynomial.pyx']),
|
|
|
|
Extension('sage.rings.polynomial.multi_polynomial_ideal_libsingular',
|
|
+ include_dirs = singular_incs,
|
|
sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx']),
|
|
|
|
Extension('sage.rings.polynomial.plural',
|
|
+ include_dirs = singular_incs,
|
|
sources = ['sage/rings/polynomial/plural.pyx']),
|
|
|
|
Extension('sage.rings.polynomial.multi_polynomial_libsingular',
|
|
+ include_dirs = singular_incs,
|
|
sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx']),
|
|
|
|
Extension('sage.rings.polynomial.multi_polynomial_ring_base',
|
|
@@ -1404,7 +1432,8 @@ ext_modules = [
|
|
sources = ['sage/rings/polynomial/polydict.pyx']),
|
|
|
|
Extension('sage.rings.polynomial.polynomial_complex_arb',
|
|
- 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 2018-08-29 08:35:19.955079610 -0600
|
|
+++ src/setup.py 2018-08-29 10:44:16.376279329 -0600
|
|
@@ -85,6 +85,7 @@ except KeyError:
|
|
|
|
# search for dependencies and add to gcc -I<path>
|
|
include_dirs = sage_include_directories(use_sources=True)
|
|
+include_dirs.extend(['@@CYSIGNALS@@'])
|
|
|
|
# Look for libraries in $SAGE_LOCAL/lib
|
|
library_dirs = [os.path.join(SAGE_LOCAL, "lib")]
|