Meson: make pari a dependency of cypari2

.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

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

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

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
 

src/sage/matrix/meson.build

@@ -216,7 +216,6 @@ foreach name, pyx : extension_data_cpp
     mpfr,
     ntl,
     numpy,
-    pari,
     png,
     singular,
     zlib,

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
 

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,

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