update meson files

src/meson.build

@@ -195,12 +195,6 @@ mpc = declare_dependency(
     cc.find_library('mpc'),
   ]
 )
-# Cannot be found via pkg-config
-arb = declare_dependency(
-  dependencies: [
-    cc.find_library('arb'),
-  ]
-)
 mpfi = declare_dependency(
   dependencies: [
     cc.find_library('mpfi'),

src/sage/geometry/meson.build

@@ -25,6 +25,7 @@ extension_data = {
     'abc': files('abc.pyx'),
     'integral_points_generic_dense': files('integral_points_generic_dense.pyx'),
     'integral_points_integer_dense': files('integral_points_integer_dense.pyx'),
+    'palp_normal_form': files('palp_normal_form.pyx'),
     'point_collection': files('point_collection.pyx'),
     'toric_lattice_element': files('toric_lattice_element.pyx'),
 }

src/sage/libs/arb/meson.build

@@ -29,7 +29,7 @@ foreach name, pyx : extension_data
         subdir: 'sage/libs/arb',
         install: true,
         include_directories: [inc_arb, inc_cpython, inc_flint, inc_rings],
-        dependencies: [py_dep, arb, flint, gmp, mpfr],
+        dependencies: [py_dep, flint, gmp, mpfr],
     )
 endforeach
 

src/sage/libs/flint/meson.build

@@ -34,6 +34,7 @@ py.install_sources(
 extension_data = {
     'arith': files('arith.pyx'),
     'flint': files('flint.pyx'),
+    'fmpq_poly': files('fmpq_poly.pyx'),
     'fmpz_factor': files('fmpz_factor.pyx'),
     'fmpz_poly': files('fmpz_poly.pyx'),
     'qsieve': files('qsieve.pyx'),

src/sage/matrix/meson.build

@@ -49,6 +49,7 @@ extension_data = {
     'matrix_generic_dense': files('matrix_generic_dense.pyx'),
     'matrix_generic_sparse': files('matrix_generic_sparse.pyx'),
     # 'matrix_gfpn_dense': files('matrix_gfpn_dense.pyx'), # not yet on conda
+    'matrix_laurent_mpolynomial_dense': files('matrix_laurent_mpolynomial_dense.pyx'),
     'matrix_numpy_dense': files('matrix_numpy_dense.pyx'),
     'matrix_numpy_integer_dense': files('matrix_numpy_integer_dense.pyx'),
     'matrix_polynomial_dense': files('matrix_polynomial_dense.pyx'),
@@ -70,7 +71,7 @@ foreach name, pyx : extension_data
         subdir: 'sage/matrix',
         install: true,
         include_directories: [inc_arb, inc_cpython, inc_ext, inc_flint, inc_ntl, inc_numpy, inc_rings, inc_rings_finite],
-        dependencies: [py_dep, arb, cblas, cypari2, cysignals, fflas, flint, gd, givaro, gmp, gmpxx, iml, linbox, m, m4ri, m4rie, mpfi, mpfr, mtx, ntl, pari, png, zlib],
+        dependencies: [py_dep, cblas, cypari2, cysignals, fflas, flint, gd, givaro, gmp, gmpxx, iml, linbox, m, m4ri, m4rie, mpfi, mpfr, mtx, ntl, pari, png, zlib],
     )
 endforeach
 
@@ -94,7 +95,7 @@ foreach name, pyx : extension_data_cpp
         install: true,
         override_options : ['cython_language=cpp'],
         include_directories: [inc_arb, inc_cpython, inc_ext, inc_flint, inc_ntl, inc_numpy, inc_rings, inc_rings_finite],
-        dependencies: [py_dep, arb, cblas, cypari2, cysignals, fflas, flint, gd, givaro, gmp, gmpxx, iml, linbox, m, m4ri, m4rie, mpfi, mpfr, mtx, ntl, pari, png, singular, zlib],
+        dependencies: [py_dep, cblas, cypari2, cysignals, fflas, flint, gd, givaro, gmp, gmpxx, iml, linbox, m, m4ri, m4rie, mpfi, mpfr, mtx, ntl, pari, png, singular, zlib],
     )
 endforeach
 

src/sage/meson.build

@@ -21,7 +21,6 @@ conf_data.set('SAGE_MAXIMA', maxima.full_path())
 conf_data.set('SAGE_MAXIMA_FAS', '')
 # Kenzo cannot yet be provided by the system, so we always use the SAGE_LOCAL path for now.
 conf_data.set('SAGE_KENZO_FAS', '\'${prefix}\'/lib/ecl/kenzo.fas')
-conf_data.set('SAGE_ARB_LIBRARY', 'arb')
 # It can be found, so we don't have to set anything here:
 conf_data.set('NTL_INCDIR', '')
 conf_data.set('NTL_LIBDIR', '')

src/sage/rings/meson.build

@@ -131,7 +131,7 @@ foreach name, pyx : extension_data
         subdir: 'sage/rings',
         install: true,
         include_directories: [inc_arb, inc_cpython, inc_ext, inc_flint, inc_gsl, inc_ntl, inc_rings, inc_rings_finite],
-        dependencies: [py_dep, arb, cypari2, cysignals, flint, gmp, gmpy2, gsl, m, mpc, mpfi, mpfr, ntl, pari, pthread],
+        dependencies: [py_dep, cypari2, cysignals, flint, gmp, gmpy2, gsl, m, mpc, mpfi, mpfr, ntl, pari, pthread],
     )
 endforeach
 
@@ -149,7 +149,7 @@ foreach name, pyx : extension_data_cpp
         install: true,
         override_options : ['cython_language=cpp'],
         include_directories: [inc_arb, inc_cpython, inc_ext, inc_flint, inc_gsl, inc_ntl, inc_rings, inc_rings_finite],
-        dependencies: [py_dep, arb, cypari2, cysignals, flint, gmp, gmpy2, gsl, m, mpc, mpfi, mpfr, ntl, pari, pthread],
+        dependencies: [py_dep, cypari2, cysignals, flint, gmp, gmpy2, gsl, m, mpc, mpfi, mpfr, ntl, pari, pthread],
     )
 endforeach
 

src/sage/rings/number_field/meson.build

@@ -57,7 +57,7 @@ foreach name, pyx : extension_data_cpp
         install: true,
         override_options : ['cython_language=cpp'],
         include_directories: [inc_arb, inc_cpython, inc_ext, inc_flint, inc_ntl, inc_rings],
-        dependencies: [py_dep, arb, cypari2, cysignals, flint, gmp, mpfi, mpfr, ntl],
+        dependencies: [py_dep, cypari2, cysignals, flint, gmp, mpfi, mpfr, ntl],
     )
 endforeach
 

src/sage/rings/polynomial/meson.build

@@ -97,7 +97,7 @@ foreach name, pyx : extension_data
         subdir: 'sage/rings/polynomial',
         install: true,
         include_directories: [inc_arb, inc_cpython, inc_ext, inc_flint, inc_ntl, inc_numpy, inc_rings, inc_rings_finite],
-        dependencies: [py_dep, arb, cypari2, cysignals, flint, givaro, gmp, mpfi, mpfr, ntl, pari],
+        dependencies: [py_dep, cypari2, cysignals, flint, givaro, gmp, mpfi, mpfr, ntl, pari],
     )
 endforeach
 
@@ -122,7 +122,7 @@ foreach name, pyx : extension_data_cpp
         install: true,
         override_options : ['cython_language=cpp'],
         include_directories: [inc_arb, inc_cpython, inc_ext, inc_flint, inc_ntl, inc_numpy, inc_rings, inc_rings_finite],
-        dependencies: [py_dep, arb, cypari2, cysignals, flint, givaro, gmp, mpfi, mpfr, ntl, pari, singular],
+        dependencies: [py_dep, cypari2, cysignals, flint, givaro, gmp, mpfi, mpfr, ntl, pari, singular],
     )
 endforeach