Blob Blame History Raw
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig	2019-06-26 14:41:04.000000000 -0600
+++ src/module_list.py	2019-09-17 16:06:38.678583204 -0600
@@ -357,16 +357,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'],
@@ -385,10 +385,10 @@ ext_modules = [
     Extension('sage.graphs.graph_decompositions.cutwidth',
               sources = ['sage/graphs/graph_decompositions/cutwidth.pyx']),
 
-    OptionalExtension('sage.graphs.graph_decompositions.tdlib',
-              sources = ['sage/graphs/graph_decompositions/tdlib.pyx'],
-              language="c++",
-              package = 'tdlib'),
+#    OptionalExtension('sage.graphs.graph_decompositions.tdlib',
+#              sources = ['sage/graphs/graph_decompositions/tdlib.pyx'],
+#              language="c++",
+#              package = 'tdlib'),
 
     Extension('sage.graphs.spanning_tree',
               sources = ['sage/graphs/spanning_tree.pyx']),
@@ -440,9 +440,9 @@ ext_modules = [
     ##
     ################################
 
-    OptionalExtension("sage.interfaces.primecount",
+    Extension("sage.interfaces.primecount",
               ["sage/interfaces/primecount.pyx"],
-              package = "primecount"),
+              libraries = ["primecount"]),
 
     Extension('*', ['sage/interfaces/*.pyx']),
 
@@ -461,21 +461,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"],
@@ -504,10 +502,9 @@ 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']),
@@ -527,10 +524,10 @@ ext_modules = [
     Extension('sage.libs.lrcalc.lrcalc',
               sources = ["sage/libs/lrcalc/lrcalc.pyx"]),
 
-    OptionalExtension("sage.libs.meataxe",
-              sources = ['sage/libs/meataxe.pyx'],
-              libraries = ['mtx'],
-              package = 'meataxe'),
+#    OptionalExtension("sage.libs.meataxe",
+#              sources = ['sage/libs/meataxe.pyx'],
+#              libraries = ['mtx'],
+#              package = 'meataxe'),
 
     Extension('*', ['sage/libs/pari/*.pyx']),
 
@@ -841,10 +838,10 @@ ext_modules = [
     Extension('sage.matrix.matrix_window',
               sources = ['sage/matrix/matrix_window.pyx']),
 
-    OptionalExtension("sage.matrix.matrix_gfpn_dense",
-              sources = ['sage/matrix/matrix_gfpn_dense.pyx'],
-              libraries = ['mtx'],
-              package = 'meataxe'),
+#    OptionalExtension("sage.matrix.matrix_gfpn_dense",
+#              sources = ['sage/matrix/matrix_gfpn_dense.pyx'],
+#              libraries = ['mtx'],
+#              package = 'meataxe'),
 
     Extension('sage.matrix.misc',
               sources = ['sage/matrix/misc.pyx']),
@@ -1021,26 +1018,25 @@ ext_modules = [
     Extension("sage.numerical.backends.interactivelp_backend",
               ["sage/numerical/backends/interactivelp_backend.pyx"]),
 
-    OptionalExtension("sage.numerical.backends.gurobi_backend",
-              ["sage/numerical/backends/gurobi_backend.pyx"],
-              libraries = ["gurobi"],
-              condition = os.path.isfile(SAGE_INC + "/gurobi_c.h") and
-                  os.path.isfile(SAGE_LOCAL + "/lib/libgurobi.so")),
+#    OptionalExtension("sage.numerical.backends.gurobi_backend",
+#              ["sage/numerical/backends/gurobi_backend.pyx"],
+#              libraries = ["gurobi"],
+#              condition = os.path.isfile(SAGE_INC + "/gurobi_c.h") and
+#                  os.path.isfile(SAGE_LOCAL + "/lib/libgurobi.so")),
 
-    OptionalExtension("sage.numerical.backends.cplex_backend",
-              ["sage/numerical/backends/cplex_backend.pyx"],
-              libraries = ["cplex"],
-              condition = os.path.isfile(SAGE_INC + "/cplex.h") and
-                  os.path.isfile(SAGE_LOCAL + "/lib/libcplex.a")),
+#    OptionalExtension("sage.numerical.backends.cplex_backend",
+#              ["sage/numerical/backends/cplex_backend.pyx"],
+#              libraries = ["cplex"],
+#              condition = os.path.isfile(SAGE_INC + "/cplex.h") and
+#                  os.path.isfile(SAGE_LOCAL + "/lib/libcplex.a")),
 
-    OptionalExtension("sage.numerical.backends.coin_backend",
+    Extension("sage.numerical.backends.coin_backend",
               ["sage/numerical/backends/coin_backend.pyx"],
               language = 'c++',
               libraries = ["Cbc", "CbcSolver", "Cgl", "Clp", "CoinUtils",
                            "OsiCbc", "OsiClp", "Osi"] + lapack_libs,
               library_dirs = lapack_library_dirs,
-              include_dirs = lapack_include_dirs,
-              package = 'cbc'),
+              include_dirs = lapack_include_dirs),
 
     ################################
     ##