mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-18 10:19:03 -04:00
eb706cd5f8
- Drop upstreamed -nauty patch. - Drop -cbc patch; upstream uses the system Cbc now. - Add -ecl patch for ecl 20.4.24.
156 lines
6 KiB
Diff
156 lines
6 KiB
Diff
diff -up src/module_list.py.orig src/module_list.py
|
|
--- src/module_list.py.orig 2020-05-20 16:33:41.000000000 -0600
|
|
+++ src/module_list.py 2020-07-06 16:38:17.108266850 -0600
|
|
@@ -401,16 +401,16 @@ ext_modules = [
|
|
Extension('sage.graphs.matchpoly',
|
|
sources = ['sage/graphs/matchpoly.pyx']),
|
|
|
|
- OptionalExtension("sage.graphs.mcqd",
|
|
+ Extension("sage.graphs.mcqd",
|
|
["sage/graphs/mcqd.pyx"],
|
|
language = "c++",
|
|
- package = 'mcqd'),
|
|
+ libraries = ['mcqd']),
|
|
|
|
- OptionalExtension("sage.graphs.bliss",
|
|
+ Extension("sage.graphs.bliss",
|
|
["sage/graphs/bliss.pyx"],
|
|
language = "c++",
|
|
- libraries = ['bliss'],
|
|
- package = 'bliss'),
|
|
+ include_dirs = ['/usr/include/bliss'],
|
|
+ libraries = ['bliss']),
|
|
|
|
Extension('sage.graphs.planarity',
|
|
sources = ['sage/graphs/planarity.pyx'],
|
|
@@ -429,10 +429,9 @@ ext_modules = [
|
|
Extension('sage.graphs.graph_decompositions.cutwidth',
|
|
sources = ['sage/graphs/graph_decompositions/cutwidth.pyx']),
|
|
|
|
- OptionalExtension('sage.graphs.graph_decompositions.tdlib',
|
|
+ Extension('sage.graphs.graph_decompositions.tdlib',
|
|
sources = ['sage/graphs/graph_decompositions/tdlib.pyx'],
|
|
- language="c++",
|
|
- package = 'tdlib'),
|
|
+ language="c++"),
|
|
|
|
Extension('sage.graphs.graph_decompositions.clique_separators',
|
|
sources = ['sage/graphs/graph_decompositions/clique_separators.pyx']),
|
|
@@ -494,9 +493,9 @@ ext_modules = [
|
|
##
|
|
################################
|
|
|
|
- OptionalExtension("sage.interfaces.primecount",
|
|
+ Extension("sage.interfaces.primecount",
|
|
["sage/interfaces/primecount.pyx"],
|
|
- package = "primecount"),
|
|
+ libraries = ["primecount"]),
|
|
|
|
Extension('*', ['sage/interfaces/*.pyx']),
|
|
|
|
@@ -515,21 +514,19 @@ ext_modules = [
|
|
##
|
|
################################
|
|
|
|
- OptionalExtension('sage.libs.coxeter3.coxeter',
|
|
+ Extension('sage.libs.coxeter3.coxeter',
|
|
sources = ['sage/libs/coxeter3/coxeter.pyx'],
|
|
- include_dirs = [os.path.join(SAGE_INC, 'coxeter')],
|
|
+ include_dirs = ['/usr/include/coxeter'],
|
|
language="c++",
|
|
- libraries = ['coxeter3'],
|
|
- package = 'coxeter3'),
|
|
+ libraries = ['coxeter3']),
|
|
|
|
Extension('sage.libs.ecl',
|
|
sources = ["sage/libs/ecl.pyx"]),
|
|
|
|
- OptionalExtension("sage.libs.fes",
|
|
+ Extension("sage.libs.fes",
|
|
["sage/libs/fes.pyx"],
|
|
language = "c",
|
|
- libraries = ['fes'],
|
|
- package = 'fes'),
|
|
+ libraries = ['fes']),
|
|
|
|
Extension('sage.libs.flint.flint',
|
|
sources = ["sage/libs/flint/flint.pyx"],
|
|
@@ -558,13 +555,14 @@ ext_modules = [
|
|
sources = ["sage/libs/homfly.pyx"],
|
|
libraries = ["homfly", "gc"]),
|
|
|
|
- OptionalExtension('sage.libs.sirocco',
|
|
+ Extension('sage.libs.sirocco',
|
|
sources = ["sage/libs/sirocco.pyx"],
|
|
libraries = ["sirocco"],
|
|
- package="sirocco",
|
|
language = 'c++'),
|
|
|
|
- Extension('*', ['sage/libs/linbox/*.pyx']),
|
|
+ Extension('*',
|
|
+ sources = ['sage/libs/linbox/*.pyx'],
|
|
+ libraries = ["gomp"]),
|
|
|
|
Extension('sage.libs.lcalc.lcalc_Lfunction',
|
|
sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
|
|
@@ -581,10 +579,9 @@ ext_modules = [
|
|
Extension('sage.libs.lrcalc.lrcalc',
|
|
sources = ["sage/libs/lrcalc/lrcalc.pyx"]),
|
|
|
|
- OptionalExtension("sage.libs.meataxe",
|
|
+ Extension("sage.libs.meataxe",
|
|
sources = ['sage/libs/meataxe.pyx'],
|
|
- libraries = ['mtx'],
|
|
- package = 'meataxe'),
|
|
+ libraries = ['mtx']),
|
|
|
|
Extension('*', ['sage/libs/pari/*.pyx']),
|
|
|
|
@@ -830,7 +827,8 @@ ext_modules = [
|
|
include_dirs = cblas_include_dirs),
|
|
|
|
Extension('sage.matrix.matrix_integer_sparse',
|
|
- sources = ['sage/matrix/matrix_integer_sparse.pyx']),
|
|
+ sources = ['sage/matrix/matrix_integer_sparse.pyx'],
|
|
+ libraries = ['gomp']),
|
|
|
|
Extension('sage.matrix.matrix_mod2_dense',
|
|
sources = ['sage/matrix/matrix_mod2_dense.pyx'],
|
|
@@ -849,20 +847,21 @@ ext_modules = [
|
|
Extension('sage.matrix.matrix_modn_dense_float',
|
|
sources = ['sage/matrix/matrix_modn_dense_float.pyx'],
|
|
language="c++",
|
|
- libraries = cblas_libs,
|
|
+ libraries = cblas_libs + ['gomp'],
|
|
library_dirs = cblas_library_dirs,
|
|
include_dirs = cblas_include_dirs),
|
|
|
|
Extension('sage.matrix.matrix_modn_dense_double',
|
|
sources = ['sage/matrix/matrix_modn_dense_double.pyx'],
|
|
language="c++",
|
|
- libraries = cblas_libs,
|
|
+ libraries = cblas_libs + ['gomp'],
|
|
library_dirs = cblas_library_dirs,
|
|
include_dirs = cblas_include_dirs,
|
|
extra_compile_args = ["-D_XPG6"]),
|
|
|
|
Extension('sage.matrix.matrix_modn_sparse',
|
|
- sources = ['sage/matrix/matrix_modn_sparse.pyx']),
|
|
+ sources = ['sage/matrix/matrix_modn_sparse.pyx'],
|
|
+ libraries = ['gomp']),
|
|
|
|
Extension('sage.matrix.matrix_mpolynomial_dense',
|
|
sources = ['sage/matrix/matrix_mpolynomial_dense.pyx']),
|
|
@@ -892,10 +891,9 @@ ext_modules = [
|
|
Extension('sage.matrix.matrix_window',
|
|
sources = ['sage/matrix/matrix_window.pyx']),
|
|
|
|
- OptionalExtension("sage.matrix.matrix_gfpn_dense",
|
|
+ Extension("sage.matrix.matrix_gfpn_dense",
|
|
sources = ['sage/matrix/matrix_gfpn_dense.pyx'],
|
|
- libraries = ['mtx'],
|
|
- package = 'meataxe'),
|
|
+ libraries = ['mtx']),
|
|
|
|
Extension('sage.matrix.misc',
|
|
sources = ['sage/matrix/misc.pyx']),
|