Skip to content

Commit

Permalink
Revert "Reenable flint compilation for most modules"
Browse files Browse the repository at this point in the history
This reverts commit 424cc74.
  • Loading branch information
tobiasdiez committed Jan 11, 2025
1 parent 9e41805 commit f540844
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
6 changes: 6 additions & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
2 changes: 1 addition & 1 deletion src/sage/rings/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
8 changes: 2 additions & 6 deletions src/sage/rings/polynomial/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit f540844

Please sign in to comment.