Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build of meataxe extension with meson #38972

Merged
merged 2 commits into from
Dec 8, 2024
+2 −4
Merged

Fix build of meataxe extension with meson #38972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af3b81b
Fix build of meataxe extension with meson
antonio-rojas Nov 15, 2024
46892d4
Merge remote-tracking branch 'upstream/develop' into meson-meataxe
antonio-rojas Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ singular = dependency('Singular')
maxima = find_program('maxima', required: true)
# Cannot be found via pkg-config
ntl = cc.find_library('ntl')
# Cannot be found via pkg-config
meataxe = cc.find_library('meataxe', required: false, disabler: true)

# Meson currently ignores include_directories for Cython modules, so we
# have to add them manually.
Expand Down
2 changes: 1 addition & 1 deletion src/sage/libs/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ foreach name, pyx : extension_data
if name == 'sirocco'
deps += [sirocco]
elif name == 'meataxe'
deps += [mtx, meataxe]
deps += [mtx]
endif

py.extension_module(
Expand Down
2 changes: 1 addition & 1 deletion src/sage/matrix/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ extension_data = {
foreach name, pyx : extension_data
dependencies = [py_dep, cysignals, gmp]
if name == 'matrix_gfpn_dense'
dependencies += [mtx, meataxe]
dependencies += [mtx]
elif name == 'matrix_gap'
dependencies += [gap]
elif name == 'misc_mpfr'
Expand Down
Loading