diff -up src/sage/env.py.orig src/sage/env.py --- src/sage/env.py.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/env.py 2020-10-30 15:44:29.575821493 -0600 @@ -413,7 +413,8 @@ def cython_aliases(): aliases[var + "INCDIR"] = pc['include_dirs'] aliases[var + "LIBDIR"] = pc['library_dirs'] aliases[var + "LIBEXTRA"] = list(filter(lambda s: not s.startswith(('-l','-L')), libs.split())) - aliases[var + "LIBRARIES"] = pc['libraries'] + aliases[var + "LIBRARIES"] = pc['libraries'] + ['gomp'] + aliases['Singular_INCDIR'] = ['/usr/include/singular', '/usr/include/factory'] # uname-specific flags UNAME = os.uname() diff -up src/sage/graphs/mcqd.pyx.orig src/sage/graphs/mcqd.pyx --- src/sage/graphs/mcqd.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/graphs/mcqd.pyx 2020-10-30 15:47:32.294609185 -0600 @@ -1,4 +1,5 @@ # distutils: language = c++ +# distutils: libraries = mcqd # sage_setup: distribution = sage-mcqd from sage.ext.memory_allocator cimport MemoryAllocator diff -up src/sage/interfaces/primecount.pyx.orig src/sage/interfaces/primecount.pyx --- src/sage/interfaces/primecount.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/interfaces/primecount.pyx 2020-10-30 15:47:42.766597012 -0600 @@ -1,3 +1,4 @@ +# distutils: libraries = primecount # sage_setup: distribution = sage-primecount r""" diff -up src/sage/libs/arb/arb.pxd.orig src/sage/libs/arb/arb.pxd --- src/sage/libs/arb/arb.pxd.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/libs/arb/arb.pxd 2020-10-30 15:47:18.918624733 -0600 @@ -1,4 +1,5 @@ # distutils: libraries = gmp flint ARB_LIBRARY +# distutils: include_dirs = /usr/include/arb /usr/include/flint # distutils: depends = arb.h from sage.libs.arb.types cimport * diff -up src/sage/libs/arb/arb_version.pyx.orig src/sage/libs/arb/arb_version.pyx --- src/sage/libs/arb/arb_version.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/libs/arb/arb_version.pyx 2020-10-30 15:54:30.743122593 -0600 @@ -1,4 +1,5 @@ # -*- coding: utf-8 +# distutils: include_dirs = /usr/include/arb /usr/include/flint from sage.libs.arb.arb cimport arb_version from sage.cpython.string cimport char_to_str diff -up src/sage/libs/arb/arith.pyx.orig src/sage/libs/arb/arith.pyx --- src/sage/libs/arb/arith.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/libs/arb/arith.pyx 2020-10-30 15:54:53.191096510 -0600 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/arb /usr/include/flint """ Arithmetic functions using the arb library """ diff -up src/sage/libs/mpmath/ext_impl.pyx.orig src/sage/libs/mpmath/ext_impl.pyx --- src/sage/libs/mpmath/ext_impl.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/libs/mpmath/ext_impl.pyx 2020-10-30 15:52:15.823279433 -0600 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/flint """ This module provides the core implementation of multiprecision floating-point arithmetic. Operations are done in-place. diff -up src/sage/libs/mpmath/ext_libmp.pyx.orig src/sage/libs/mpmath/ext_libmp.pyx --- src/sage/libs/mpmath/ext_libmp.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/libs/mpmath/ext_libmp.pyx 2020-10-30 15:53:01.023226835 -0600 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/flint """ Faster versions of some key functions in mpmath.libmp """ diff -up src/sage/libs/mpmath/ext_main.pyx.orig src/sage/libs/mpmath/ext_main.pyx --- src/sage/libs/mpmath/ext_main.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/libs/mpmath/ext_main.pyx 2020-10-30 15:52:35.663256336 -0600 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/flint """ mpmath floating-point numbers diff -up src/sage/libs/mpmath/utils.pyx.orig src/sage/libs/mpmath/utils.pyx --- src/sage/libs/mpmath/utils.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/libs/mpmath/utils.pyx 2020-10-30 15:51:33.798328356 -0600 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/flint """ Utilities for Sage-mpmath interaction diff -up src/sage/matrix/matrix_complex_ball_dense.pyx.orig src/sage/matrix/matrix_complex_ball_dense.pyx --- src/sage/matrix/matrix_complex_ball_dense.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/matrix/matrix_complex_ball_dense.pyx 2020-10-30 15:55:44.799036557 -0600 @@ -1,4 +1,5 @@ # distutils: libraries = ARB_LIBRARY +# distutils: include_dirs = /usr/include/arb /usr/include/flint r""" Arbitrary precision complex ball matrices using Arb diff -up src/sage/matrix/matrix_cyclo_dense.pyx.orig src/sage/matrix/matrix_cyclo_dense.pyx --- src/sage/matrix/matrix_cyclo_dense.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/matrix/matrix_cyclo_dense.pyx 2020-10-30 15:56:45.647965864 -0600 @@ -1,5 +1,6 @@ # distutils: language = c++ # distutils: libraries = ntl +# distutils: include_dirs = /usr/include/arb /usr/include/flint """ Matrices over Cyclotomic Fields diff -up src/sage/matrix/matrix_mpolynomial_dense.pyx.orig src/sage/matrix/matrix_mpolynomial_dense.pyx --- src/sage/matrix/matrix_mpolynomial_dense.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/matrix/matrix_mpolynomial_dense.pyx 2020-10-30 15:57:50.862889413 -0600 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/singular /usr/include/factory """ Dense matrices over multivariate polynomials over fields diff -up src/sage/rings/complex_arb.pyx.orig src/sage/rings/complex_arb.pyx --- src/sage/rings/complex_arb.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/rings/complex_arb.pyx 2020-11-05 15:42:05.494453973 -0700 @@ -1,4 +1,5 @@ # -*- coding: utf-8 +# distutils: include_dirs = /usr/include/arb /usr/include/flint r""" Arbitrary precision complex balls using Arb diff -up src/sage/rings/number_field/number_field_element_quadratic.pyx.orig src/sage/rings/number_field/number_field_element_quadratic.pyx --- src/sage/rings/number_field/number_field_element_quadratic.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/rings/number_field/number_field_element_quadratic.pyx 2020-11-05 15:48:03.436448764 -0700 @@ -1,5 +1,6 @@ # distutils: libraries = ntl # distutils: language = c++ +# distutils: include_dirs = /usr/include/arb /usr/include/flint """ Optimized Quadratic Number Field Elements diff -up src/sage/rings/polynomial/multi_polynomial_libsingular.pyx.orig src/sage/rings/polynomial/multi_polynomial_libsingular.pyx --- src/sage/rings/polynomial/multi_polynomial_libsingular.pyx.orig 2020-10-30 11:34:26.064980206 -0600 +++ src/sage/rings/polynomial/multi_polynomial_libsingular.pyx 2020-10-30 16:02:19.239570828 -0600 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/singular /usr/include/factory r""" Multivariate Polynomials via libSINGULAR diff -up src/sage/rings/polynomial/multi_polynomial.pyx.orig src/sage/rings/polynomial/multi_polynomial.pyx --- src/sage/rings/polynomial/multi_polynomial.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/rings/polynomial/multi_polynomial.pyx 2020-11-05 15:42:05.505453973 -0700 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/singular /usr/include/factory r""" Base class for elements of multivariate polynomial rings """ diff -up src/sage/rings/polynomial/plural.pyx.orig src/sage/rings/polynomial/plural.pyx --- src/sage/rings/polynomial/plural.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/rings/polynomial/plural.pyx 2020-11-05 15:42:05.507453973 -0700 @@ -1,3 +1,4 @@ +# distutils: include_dirs = /usr/include/singular /usr/include/factory r""" Noncommutative Polynomials via libSINGULAR/Plural diff -up src/sage/rings/polynomial/polynomial_complex_arb.pyx.orig src/sage/rings/polynomial/polynomial_complex_arb.pyx --- src/sage/rings/polynomial/polynomial_complex_arb.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/rings/polynomial/polynomial_complex_arb.pyx 2020-10-30 16:03:19.870498851 -0600 @@ -1,4 +1,5 @@ # -*- coding: utf-8 +# distutils: include_dirs = /usr/include/arb /usr/include/flint r""" Univariate polynomials over `\CC` with interval coefficients using Arb. diff -up src/sage/rings/real_arb.pyx.orig src/sage/rings/real_arb.pyx --- src/sage/rings/real_arb.pyx.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/rings/real_arb.pyx 2020-11-05 15:42:05.510453973 -0700 @@ -1,4 +1,5 @@ # -*- coding: utf-8 +# distutils: include_dirs = /usr/include/arb /usr/include/flint r""" Arbitrary precision real balls using Arb diff -up src/sage_setup/command/sage_build_cython.py.orig src/sage_setup/command/sage_build_cython.py --- src/sage_setup/command/sage_build_cython.py.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage_setup/command/sage_build_cython.py 2020-10-30 16:04:33.325411659 -0600 @@ -59,6 +59,7 @@ if subprocess.call("""$CC --version | gr # Search for dependencies in the source tree and add to the list of include directories include_dirs = sage_include_directories(use_sources=True) +include_dirs.extend(['@@CYSIGNALS@@']) # Look for libraries only in what is configured already through distutils # and environment variables