Skip to content

Commit

Permalink
Trac #29720: Move Extension options from src/module_list.py to "distu…
Browse files Browse the repository at this point in the history
…tils:" directives in the individual files (part 2 - OptionalExtensions)

Follow-up from #29706.

In this part, we take care of all `OptionalExtension`s except for
- `tdlib`, which is taken care of in #29701;
- `coxeter` (#29721)

URL: https://trac.sagemath.org/29720
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): Jonathan Kliem
  • Loading branch information
Release Manager committed Jun 23, 2020
2 parents 0d23704 + 2821934 commit e92de38
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 10 deletions.
11 changes: 1 addition & 10 deletions src/module_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,10 @@ def uname_specific(name, value, alternative):

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'),

Extension('sage.graphs.planarity',
Expand Down Expand Up @@ -527,8 +524,6 @@ def uname_specific(name, value, alternative):

OptionalExtension("sage.libs.fes",
["sage/libs/fes.pyx"],
language = "c",
libraries = ['fes'],
package = 'fes'),

Extension('sage.libs.flint.flint',
Expand Down Expand Up @@ -560,9 +555,7 @@ def uname_specific(name, value, alternative):

OptionalExtension('sage.libs.sirocco',
sources = ["sage/libs/sirocco.pyx"],
libraries = ["sirocco"],
package="sirocco",
language = 'c++'),
package="sirocco"),

Extension('*', ['sage/libs/linbox/*.pyx']),

Expand All @@ -583,7 +576,6 @@ def uname_specific(name, value, alternative):

OptionalExtension("sage.libs.meataxe",
sources = ['sage/libs/meataxe.pyx'],
libraries = ['mtx'],
package = 'meataxe'),

Extension('*', ['sage/libs/pari/*.pyx']),
Expand Down Expand Up @@ -894,7 +886,6 @@ def uname_specific(name, value, alternative):

OptionalExtension("sage.matrix.matrix_gfpn_dense",
sources = ['sage/matrix/matrix_gfpn_dense.pyx'],
libraries = ['mtx'],
package = 'meataxe'),

Extension('sage.matrix.misc',
Expand Down
4 changes: 4 additions & 0 deletions src/sage/graphs/bliss.pyx
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# distutils: language = c++
# distutils: libraries = bliss
# sage_setup: distribution = sage-bliss

r"""
Interface with bliss: graph (iso/auto)morphism
Expand Down
2 changes: 2 additions & 0 deletions src/sage/graphs/mcqd.pyx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# distutils: language = c++
# sage_setup: distribution = sage-mcqd

from sage.ext.memory_allocator cimport MemoryAllocator

Expand Down
2 changes: 2 additions & 0 deletions src/sage/interfaces/primecount.pyx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# sage_setup: distribution = sage-primecount

r"""
Interface to the primecount library
"""
Expand Down
3 changes: 3 additions & 0 deletions src/sage/libs/fes.pyx
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# distutils: language = c
# distutils: libraries = fes
# sage_setup: distribution = sage-fes
"""
Binding for the FES library
Expand Down
2 changes: 2 additions & 0 deletions src/sage/libs/meataxe.pyx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# distutils: libraries = mtx
# sage_setup: distribution = sage-meataxe
#*****************************************************************************
# Copyright (C) 2017 Simon King <[email protected]>
#
Expand Down
3 changes: 3 additions & 0 deletions src/sage/libs/sirocco.pyx
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#cython: boundscheck=False, wraparound=False
# distutils: libraries = sirocco
# distutils: language = c++
# sage_setup: distribution = sage-sirocco
r"""
Cython wrapper for sirocco library
Expand Down
2 changes: 2 additions & 0 deletions src/sage/matrix/matrix_gfpn_dense.pyx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# distutils: libraries = mtx
# sage_setup: distribution = sage-meataxe
r"""
Dense Matrices over `\mathbb F_q`, with `q<255`.
Expand Down

0 comments on commit e92de38

Please sign in to comment.