diff -up src/module_list.py.orig src/module_list.py --- src/module_list.py.orig 2017-11-08 08:30:03.588222687 -0500 +++ src/module_list.py 2017-11-08 08:30:21.532223375 -0500 @@ -62,6 +62,7 @@ linbox_cflags = pkgconfig.cflags('linbox # Singular singular_pc = pkgconfig.parse('Singular') singular_libs = singular_pc['libraries'] +singular_incs = [SAGE_INC + '/singular', SAGE_INC + '/factory'] singular_library_dirs = singular_pc['library_dirs'] singular_cflags = pkgconfig.cflags('Singular').split() @@ -185,7 +186,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('sage.algebras.quatalg.quaternion_algebra_cython', sources = ['sage/algebras/quatalg/quaternion_algebra_cython.pyx'], @@ -581,7 +583,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')]), Extension('*', ['sage/libs/pari/*.pyx']), @@ -598,7 +601,8 @@ 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"], @@ -606,17 +610,21 @@ ext_modules = [ Extension('sage.libs.mpmath.utils', sources = ["sage/libs/mpmath/utils.pyx"], - libraries = ['mpfr']), + libraries = ['mpfr'], + include_dirs = [os.path.join(SAGE_INC, "flint")]), Extension('sage.libs.mpmath.ext_impl', sources = ["sage/libs/mpmath/ext_impl.pyx"], - libraries = ['mpfr']), + libraries = ['mpfr'], + 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")]), ################################### ## @@ -624,7 +632,8 @@ ext_modules = [ ## ################################### - Extension('*', ["sage/libs/arb/*.pyx"]), + Extension('*', ["sage/libs/arb/*.pyx"], + include_dirs = [SAGE_INC + '/flint', SAGE_INC + '/arb']), ################################### ## @@ -805,6 +814,7 @@ ext_modules = [ Extension("sage.matrix.matrix_complex_ball_dense", ["sage/matrix/matrix_complex_ball_dense.pyx"], libraries=['arb', 'mpfi', 'mpfr'], + include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'], language = "c++"), Extension('sage.matrix.matrix_complex_double_dense', @@ -872,6 +882,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', @@ -1201,6 +1212,7 @@ ext_modules = [ Extension("sage.rings.complex_arb", ["sage/rings/complex_arb.pyx"], libraries=['mpfi', 'mpfr', 'gmp'], + include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'], language = 'c++'), Extension('sage.rings.complex_double', @@ -1276,6 +1288,7 @@ ext_modules = [ Extension("sage.rings.real_arb", ["sage/rings/real_arb.pyx"], libraries = ['mpfi', 'mpfr'], + include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'], language = 'c++'), Extension('sage.rings.real_lazy', @@ -1481,12 +1494,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_generic', @@ -1500,6 +1516,7 @@ ext_modules = [ Extension('sage.rings.polynomial.polynomial_complex_arb', sources = ['sage/rings/polynomial/polynomial_complex_arb.pyx'], + include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'], language="c++"), Extension('sage.rings.polynomial.polynomial_compiled', diff -up src/setup.py.orig src/setup.py --- src/setup.py.orig 2017-11-08 08:30:03.589222688 -0500 +++ src/setup.py 2017-11-08 08:30:21.533223375 -0500 @@ -89,6 +89,7 @@ except KeyError: # search for dependencies and add to gcc -I # this depends on SAGE_CYTHONIZED 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")]