Skip to content

Commit

Permalink
sagemathgh-38972: Fix build of meataxe extension with meson
Browse files Browse the repository at this point in the history
    
meataxe is not a library, the library is called mtx and is already
searched for
    
URL: sagemath#38972
Reported by: Antonio Rojas
Reviewer(s): Tobias Diez
  • Loading branch information
Release Manager committed Dec 5, 2024
2 parents 18667d7 + 46892d4 commit 84289b9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,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
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
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

0 comments on commit 84289b9

Please sign in to comment.