Meson: Improve handling of dependencies

src/meson.build

@@ -85,11 +85,15 @@ gsl = dependency(
   required: true,
 )
 gd = cc.find_library('gd')
-m = cc.find_library('m')
+# Only some platforms have a standalone math library (https://mesonbuild.com/howtox.html#add-math-library-lm-portably)
+m = cc.find_library('m', required: false)
 m4ri = cc.find_library('m4ri')
 m4rie = cc.find_library('m4rie')
 mtx = cc.find_library('mtx', required: false, disabler: true)
-png = cc.find_library('png')
+png = cc.find_library('png', required: false)
+if not png.found()
+  png = cc.find_library('png16')
+endif
 zlib = cc.find_library('z')
 # Cannot be found via pkg-config
 ec = cc.find_library('ec')

src/sage/coding/codecan/meson.build

@@ -17,7 +17,7 @@ foreach name, pyx : extension_data
       inc_partn_ref2,
       inc_rings,
     ],
-    dependencies: [py_dep, cysignals, gmp],
+    dependencies: [py_dep, cysignals, gap, gmp],
   )
 endforeach
 

src/sage/combinat/meson.build

@@ -145,13 +145,18 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, cysignals, gmp]
+  if name == 'enumeration_mod_permgroup'
+    deps += [gap]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
     subdir: 'sage/combinat',
     install: true,
     include_directories: [inc_cpython, inc_data_structures, inc_rings],
-    dependencies: [py_dep, cysignals, gmp],
+    dependencies: deps,
   )
 endforeach
 

src/sage/combinat/root_system/meson.build

@@ -64,13 +64,18 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, cysignals, gmp]
+  if name.startswith('reflection_group')
+    deps += [gap]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
     subdir: 'sage/combinat/root_system',
     install: true,
     include_directories: [inc_cpython, inc_rings],
-    dependencies: [py_dep, cysignals, gmp],
+    dependencies: deps,
   )
 endforeach
 

src/sage/geometry/meson.build

@@ -32,13 +32,18 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, cysignals, flint, gmp]
+  if name == 'palp_normal_form'
+    deps += [gap]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
     subdir: 'sage/geometry',
     install: true,
     include_directories: [inc_cpython, inc_ext, inc_flint, inc_rings],
-    dependencies: [py_dep, cysignals, flint, gmp],
+    dependencies: deps,
   )
 endforeach
 

src/sage/groups/matrix_gps/meson.build

@@ -33,13 +33,18 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, gmp]
+  if name == 'group_element_gap'
+    deps += [gap]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
     subdir: 'sage/groups/matrix_gps',
     install: true,
     include_directories: [inc_cpython],
-    dependencies: [py_dep, gmp],
+    dependencies: deps,
   )
 endforeach
 

src/sage/groups/meson.build

@@ -43,7 +43,7 @@ foreach name, pyx : extension_data
     subdir: 'sage/groups',
     install: true,
     include_directories: [inc_cpython],
-    dependencies: [py_dep, gmp],
+    dependencies: [py_dep, gmp, gap],
   )
 endforeach
 

src/sage/groups/perm_gps/partn_ref2/meson.build

@@ -13,7 +13,7 @@ foreach name, pyx : extension_data
     subdir: 'sage/groups/perm_gps/partn_ref2',
     install: true,
     include_directories: [inc_cpython, inc_data_structures, inc_partn_ref2],
-    dependencies: [py_dep, cysignals, gmp],
+    dependencies: [py_dep, cysignals, gmp, gap],
   )
 endforeach
 

src/sage/libs/mpmath/meson.build

@@ -21,7 +21,7 @@ foreach name, pyx : extension_data
     subdir: 'sage/libs/mpmath',
     install: true,
     include_directories: [inc_cpython, inc_ext, inc_rings],
-    dependencies: [py_dep, cypari2, cysignals, gmp, mpfr],
+    dependencies: [py_dep, cysignals, gmp, mpfr],
   )
 endforeach
 

src/sage/matrix/meson.build

@@ -96,31 +96,17 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
-  dependencies = [
-    py_dep,
-    blas,
-    cypari2,
-    cysignals,
-    fflas,
-    flint,
-    gd,
-    givaro,
-    gmp,
-    gmpxx,
-    iml,
-    linbox,
-    m,
-    m4ri,
-    m4rie,
-    mpfi,
-    mpfr,
-    ntl,
-    pari,
-    png,
-    zlib,
-  ]
+  dependencies = [py_dep, cysignals, gmp]
   if name == 'matrix_gfpn_dense'
     dependencies += [mtx, meataxe]
+  elif name == 'matrix_gap'
+    dependencies += [gap]
+  elif name == 'misc_mpfr'
+    dependencies += [mpfr]
+  elif name == 'matrix_complex_ball_dense'
+    dependencies += [mpfi]
+  elif name == 'misc_flint' or name == 'matrix_rational_sparse'
+    dependencies += [flint]
   endif
 
   py.extension_module(

src/sage/misc/meson.build

@@ -124,13 +124,18 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, gmp]
+  if name == 'binary_tree'
+    deps += [cysignals]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
     subdir: 'sage/misc',
     install: true,
     include_directories: [inc_cpython, inc_rings],
-    dependencies: [py_dep, cysignals, gmp],
+    dependencies: deps,
   )
 endforeach
 

src/sage/rings/finite_rings/meson.build

@@ -39,6 +39,15 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, cysignals, gmp]
+  if name == 'element_pari_ffelt'
+    deps += [
+      cypari2,
+      pari,  # Runtime dependency
+    ]
+  elif name == 'residue_field_pari_ffelt'
+    deps += [cypari2]
+  endif
   py.extension_module(
     name,
     sources: pyx,
@@ -51,7 +60,7 @@ foreach name, pyx : extension_data
       inc_rings,
       inc_rings_finite,
     ],
-    dependencies: [py_dep, cypari2, cysignals, givaro, gmp, m, ntl, pari],
+    dependencies: deps,
   )
 endforeach
 

src/sage/rings/meson.build

@@ -1,5 +1,3 @@
-pthread = cc.find_library('pthread')
-
 py.install_sources(
   'abc.pxd',
   'algebraic_closure_finite_field.py',
@@ -124,6 +122,43 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, cysignals, gmp]
+  if name == 'complex_arb'
+    deps += [
+      flint,
+      mpfi,
+      gsl,  # Runtime dependency
+    ]
+  elif name == 'complex_conversion'
+    deps += [gsl, mpfr]
+  elif name == 'complex_double'
+    deps += [gmpy2, gsl]
+  elif name == 'complex_interval'
+    deps += [
+      mpfi,
+      flint,  # Runtime dependency
+    ]
+  elif name == 'complex_mpc'
+    deps += [gmpy2, mpfr, mpc]
+  elif name == 'complex_mpfr'
+    deps += [gmpy2, mpfr]
+  elif name == 'factorint_flint'
+    deps += [flint]
+  elif name == 'integer'
+    deps += [gmpy2]
+  elif name == 'power_series_pari'
+    deps += [cypari2]
+  elif name == 'real_arb'
+    deps += [flint, mpfi]
+  elif name == 'real_double'
+    deps += [gmpy2]
+  elif name == 'real_double_element_gsl'
+    deps += [gsl]
+  elif name == 'real_mpfi'
+    deps += [mpfi]
+  elif name == 'real_mpfr'
+    deps += [gmpy2, mpfr]
+  endif
   py.extension_module(
     name,
     sources: pyx,
@@ -138,22 +173,7 @@ foreach name, pyx : extension_data
       inc_rings,
       inc_rings_finite,
     ],
-    dependencies: [
-      py_dep,
-      cypari2,
-      cysignals,
-      flint,
-      gmp,
-      gmpy2,
-      gsl,
-      m,
-      mpc,
-      mpfi,
-      mpfr,
-      ntl,
-      pari,
-      pthread,
-    ],
+    dependencies: deps,
   )
 endforeach
 
@@ -170,6 +190,17 @@ extension_data_cpp = {
 }
 
 foreach name, pyx : extension_data_cpp
+  deps = [py_dep, cysignals, gmp]
+  if name == 'bernmm'
+    deps += [ntl]
+  elif name == 'bernoulli_mod_p'
+    deps += [ntl]
+  elif name == 'fraction_field_FpT'
+    deps += [flint]
+  elif name == 'rational'
+    deps += [gmpy2]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
@@ -186,22 +217,7 @@ foreach name, pyx : extension_data_cpp
       inc_rings,
       inc_rings_finite,
     ],
-    dependencies: [
-      py_dep,
-      cypari2,
-      cysignals,
-      flint,
-      gmp,
-      gmpy2,
-      gsl,
-      m,
-      mpc,
-      mpfi,
-      mpfr,
-      ntl,
-      pari,
-      pthread,
-    ],
+    dependencies: deps,
   )
 endforeach
 

src/sage/rings/number_field/meson.build

@@ -37,13 +37,18 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, cysignals, gmp]
+  if name == 'totallyreal'
+    deps += [cypari2]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
     subdir: 'sage/rings/number_field',
     install: true,
     include_directories: [inc_cpython, inc_ext, inc_flint, inc_ntl, inc_rings],
-    dependencies: [py_dep, cypari2, cysignals, flint, gmp, mpfi, mpfr, ntl],
+    dependencies: deps,
   )
 endforeach
 

src/sage/rings/polynomial/meson.build

@@ -92,6 +92,19 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+  deps = [py_dep, cysignals, gmp]
+  if name == 'evaluation_flint'
+    deps += [flint, mpfi]
+  elif name == 'polynomial_complex_arb'
+    deps += [flint, mpfi]
+  elif name == 'polynomial_real_mpfr_dense'
+    deps += [mpfr]
+  elif name == 'real_roots'
+    deps += [mpfi]
+  elif name == 'hilbert'
+    deps += [mpfi]
+  endif
+
   py.extension_module(
     name,
     sources: pyx,
@@ -106,18 +119,7 @@ foreach name, pyx : extension_data
       inc_rings,
       inc_rings_finite,
     ],
-    dependencies: [
-      py_dep,
-      cypari2,
-      cysignals,
-      flint,
-      givaro,
-      gmp,
-      mpfi,
-      mpfr,
-      ntl,
-      pari,
-    ],
+    dependencies: deps,
   )
 endforeach