diff -up src/module_list.py.orig src/module_list.py --- src/module_list.py.orig 2017-11-08 06:12:26.727906504 -0500 +++ src/module_list.py 2017-11-08 06:14:29.020911187 -0500 @@ -163,7 +163,6 @@ library_order["stdc++"] = 1000 ### ############################################################# -from sage_setup.optional_extension import OptionalExtension UNAME = os.uname() def uname_specific(name, value, alternative): @@ -391,21 +390,21 @@ ext_modules = [ sources = ['sage/graphs/matchpoly.pyx'], extra_compile_args = ['-std=c99']), - OptionalExtension("sage.graphs.mcqd", - ["sage/graphs/mcqd.pyx"], - language = "c++", - package = 'mcqd'), - - OptionalExtension("sage.graphs.bliss", - ["sage/graphs/bliss.pyx"], - language = "c++", - libraries = ['bliss'], - package = 'bliss'), - - OptionalExtension('sage.graphs.modular_decomposition', - sources = ['sage/graphs/modular_decomposition.pyx'], - libraries = ['modulardecomposition'], - package = 'modular_decomposition'), +# OptionalExtension("sage.graphs.mcqd", +# ["sage/graphs/mcqd.pyx"], +# language = "c++", +# package = 'mcqd'), + +# OptionalExtension("sage.graphs.bliss", +# ["sage/graphs/bliss.pyx"], +# language = "c++", +# libraries = ['bliss'], +# package = 'bliss'), + +# OptionalExtension('sage.graphs.modular_decomposition', +# sources = ['sage/graphs/modular_decomposition.pyx'], +# libraries = ['modulardecomposition'], +# package = 'modular_decomposition'), Extension('sage.graphs.planarity', sources = ['sage/graphs/planarity.pyx'], @@ -424,10 +423,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']), @@ -514,17 +513,17 @@ ext_modules = [ ## ################################ - OptionalExtension('sage.libs.coxeter3.coxeter', - sources = ['sage/libs/coxeter3/coxeter.pyx'], - include_dirs = [os.path.join(SAGE_INC, 'coxeter')], - language="c++", - libraries = ['coxeter3'], - package = 'coxeter3'), +# OptionalExtension('sage.libs.coxeter3.coxeter', +# sources = ['sage/libs/coxeter3/coxeter.pyx'], +# include_dirs = [os.path.join(SAGE_INC, 'coxeter')], +# language="c++", +# libraries = ['coxeter3'], +# package = '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'], @@ -548,23 +547,23 @@ ext_modules = [ Extension('sage.libs.gmp.pylong', sources = ['sage/libs/gmp/pylong.pyx']), - OptionalExtension('sage.libs.braiding', - sources = ["sage/libs/braiding.pyx"], - libraries = ["braiding"], - package="libbraiding", - language = 'c++'), - - - OptionalExtension('sage.libs.homfly', - sources = ["sage/libs/homfly.pyx"], - libraries = ["homfly", "gc"], - package="libhomfly"), - - OptionalExtension('sage.libs.sirocco', - sources = ["sage/libs/sirocco.pyx"], - libraries = ["sirocco", "mpfr", "gmp"], - package="sirocco", - language = 'c++'), +# OptionalExtension('sage.libs.braiding', +# sources = ["sage/libs/braiding.pyx"], +# libraries = ["braiding"], +# package="libbraiding", +# language = 'c++'), + + +# OptionalExtension('sage.libs.homfly', +# sources = ["sage/libs/homfly.pyx"], +# libraries = ["homfly", "gc"], +# package="libhomfly"), + +# OptionalExtension('sage.libs.sirocco', +# sources = ["sage/libs/sirocco.pyx"], +# libraries = ["sirocco", "mpfr", "gmp"], +# package="sirocco", +# language = 'c++'), Extension('*', ['sage/libs/linbox/*.pyx']), @@ -901,10 +900,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'], @@ -1089,19 +1088,19 @@ 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 = ["stdc++", "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 = ["stdc++", "cplex"], - condition = os.path.isfile(SAGE_INC + "/cplex.h") and - os.path.isfile(SAGE_LOCAL + "/lib/libcplex.a")), +# OptionalExtension("sage.numerical.backends.gurobi_backend", +# ["sage/numerical/backends/gurobi_backend.pyx"], +# libraries = ["stdc++", "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 = ["stdc++", "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",