diff --git a/.gitignore b/.gitignore index 51cf481afa1..b33ca1e1cb1 100644 --- a/.gitignore +++ b/.gitignore @@ -140,11 +140,6 @@ __pycache__/ **/*.py[cod] *$py.class -# Generated by sage_setup.autogen -/src/sage/ext/interpreters -!/src/sage/ext/interpreters/meson.build -!/src/sage/ext/interpreters/README - # Generated Cython files *.so **/*.so @@ -315,6 +310,7 @@ subprojects/wrapdb.json subprojects/maxima-5.47.0 subprojects/packagecache src/sage/interfaces/__init__.py +src/sage/ext/interpreters/__init__.py src/sage/crypto/block_cipher/__init__.py src/sage/crypto/public_key/__init__.py src/sage/logic/__init__.py diff --git a/src/meson.build b/src/meson.build index eeb4b96dfa5..5560ff4bef4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -83,10 +83,11 @@ except Exception: ], check: true, ).stdout().strip() - cypari2 = declare_dependency(include_directories: inc_cypari2) + # Cannot be found via pkg-config + # We need to link against libpari directly to avoid runtime issues, so use pari as dependency of cypari2 + pari = cc.find_library('pari', required: not is_windows, disabler: true) + cypari2 = declare_dependency(include_directories: inc_cypari2, dependencies: pari) endif -# Cannot be found via pkg-config -pari = cc.find_library('pari', required: not is_windows, disabler: true) mpfr = dependency('mpfr') diff --git a/src/sage/ext/interpreters/meson.build b/src/sage/ext/interpreters/meson.build index f965ce83da0..22d03c5157f 100644 --- a/src/sage/ext/interpreters/meson.build +++ b/src/sage/ext/interpreters/meson.build @@ -67,6 +67,6 @@ foreach name, pyx : extension_data subdir: 'sage/ext/interpreters', install: true, include_directories: [inc_cpython, inc_ext, inc_rings, inc_src], - dependencies: [py_dep, cypari2, cysignals, gmp, gsl, mpc, mpfr, pari], + dependencies: [py_dep, cypari2, cysignals, gmp, gsl, mpc, mpfr], ) endforeach diff --git a/src/sage/libs/pari/meson.build b/src/sage/libs/pari/meson.build index 9df9ad0861e..92e75348739 100644 --- a/src/sage/libs/pari/meson.build +++ b/src/sage/libs/pari/meson.build @@ -38,7 +38,7 @@ foreach name, pyx : extension_data subdir: 'sage/libs/pari', install: true, include_directories: [inc_cpython, inc_ext, inc_flint, inc_gsl, inc_rings], - dependencies: [py_dep, cypari2, cysignals, flint, gmp, gsl, mpfr, pari], + dependencies: [py_dep, cypari2, cysignals, flint, gmp, gsl, mpfr], ) endforeach diff --git a/src/sage/matrix/meson.build b/src/sage/matrix/meson.build index 3e703312d11..14dac8fb5ad 100644 --- a/src/sage/matrix/meson.build +++ b/src/sage/matrix/meson.build @@ -216,7 +216,6 @@ foreach name, pyx : extension_data_cpp mpfr, ntl, numpy, - pari, png, singular, zlib, diff --git a/src/sage/rings/finite_rings/meson.build b/src/sage/rings/finite_rings/meson.build index 41ee9f0f0c6..765d1751c6a 100644 --- a/src/sage/rings/finite_rings/meson.build +++ b/src/sage/rings/finite_rings/meson.build @@ -56,8 +56,7 @@ foreach name, pyx : extension_data deps = [py_dep, cysignals, gmp] if name == 'element_pari_ffelt' deps += [ - cypari2, - pari, # Runtime dependency + cypari2 ] elif name == 'residue_field_pari_ffelt' deps += [cypari2] @@ -98,7 +97,7 @@ foreach name, pyx : extension_data_cpp inc_rings, inc_rings_finite, ], - dependencies: [py_dep, cypari2, cysignals, givaro, gmp, m, ntl, pari], + dependencies: [py_dep, cypari2, cysignals, givaro, gmp, m, ntl], ) endforeach diff --git a/src/sage/rings/polynomial/meson.build b/src/sage/rings/polynomial/meson.build index 64df9a6b861..1d679d5f2d3 100644 --- a/src/sage/rings/polynomial/meson.build +++ b/src/sage/rings/polynomial/meson.build @@ -187,7 +187,7 @@ foreach name, pyx : extension_data_cpp elif name == 'polynomial_integer_dense_flint' deps += [cypari2, flint, ntl] else - deps += [cypari2, givaro, mpfi, mpfr, ntl, pari, singular] + deps += [cypari2, givaro, mpfi, mpfr, ntl, singular] endif py.extension_module( name, diff --git a/src/sage/schemes/elliptic_curves/meson.build b/src/sage/schemes/elliptic_curves/meson.build index 155f8e8a2d9..986539d2804 100644 --- a/src/sage/schemes/elliptic_curves/meson.build +++ b/src/sage/schemes/elliptic_curves/meson.build @@ -71,7 +71,7 @@ foreach name, pyx : extension_data subdir: 'sage/schemes/elliptic_curves', install: true, include_directories: [inc_cpython, inc_flint, inc_rings], - dependencies: [py_dep, cypari2, cysignals, flint, gmp, mpfr, numpy, pari], + dependencies: [py_dep, cypari2, cysignals, flint, gmp, mpfr, numpy], ) endforeach