diff --git a/src/meson.build b/src/meson.build index cf22ed835c5..57c4060f8ac 100644 --- a/src/meson.build +++ b/src/meson.build @@ -66,11 +66,17 @@ pari = cc.find_library('pari', required: not is_windows, disabler: true) mpfr = dependency('mpfr') +if is_windows + # Flint on conda currently actives FLINT_USES_PTHREAD, which is not available under msvc + # https://github.com/conda-forge/libflint-feedstock/issues/38 + flint = disabler() +else flint = dependency('flint', version: '>=3.0.0') if flint.version().version_compare('<3.1') # In older versions of flint, pkg-config file is broken, so we manually use find_library # This has been fixed in flint v3.1: https://github.com/flintlib/flint/pull/1647 flint = cc.find_library('flint') + endif endif blas_order = [] diff --git a/src/sage/rings/meson.build b/src/sage/rings/meson.build index bb848a97ab0..bab6721d43b 100644 --- a/src/sage/rings/meson.build +++ b/src/sage/rings/meson.build @@ -135,7 +135,7 @@ foreach name, pyx : extension_data elif name == 'complex_interval' deps += [ mpfi, - flint, + flint, # Runtime dependency ] elif name == 'complex_mpc' deps += [gmpy2, mpfr, mpc] diff --git a/src/sage/rings/polynomial/meson.build b/src/sage/rings/polynomial/meson.build index 6eba87ce70a..a74efed061a 100644 --- a/src/sage/rings/polynomial/meson.build +++ b/src/sage/rings/polynomial/meson.build @@ -102,13 +102,9 @@ foreach name, pyx : extension_data elif name == 'polynomial_real_mpfr_dense' deps += [mpfr] elif name == 'real_roots' - deps += [flint, mpfi] - if is_windows - # Compilation error: include\flint\fmpz_mpoly.h(975): error C2143: syntax error: missing ')' before 'constant' - continue - endif + deps += [mpfi] elif name == 'hilbert' - deps += [flint, mpfi] + deps += [mpfi] endif py.extension_module(