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

Run meson-ci for MacOS #38879

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Run meson-ci for MacOS #38879

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
e99ed25
Run meson-ci for MacOS
tobiasdiez Jan 2, 2025
8e9b8e9
Compile some files with c++11 as temporary workaround
tobiasdiez Jan 2, 2025
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: 1 addition & 1 deletion .github/workflows/ci-meson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu]
os: [ubuntu, macos]
python: ['3.9', '3.10', '3.11']

steps:
Expand Down
6 changes: 5 additions & 1 deletion src/sage/libs/giac/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ foreach name, pyx : extension_data_cpp
sources: pyx,
subdir: 'sage/libs/giac',
install: true,
override_options: ['cython_language=cpp'],
override_options: [
'cython_language=cpp',
# Temporary workaround for https://github.com/sagemath/sage/issues/38985
'cpp_std=c++11',
],
include_directories: [inc_cpython, inc_ext, inc_rings],
dependencies: [py_dep, cysignals, giac, gmp],
)
Expand Down
6 changes: 5 additions & 1 deletion src/sage/libs/linbox/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ foreach name, pyx : extension_data_cpp
sources: pyx,
subdir: 'sage/libs/linbox',
install: true,
override_options: ['cython_language=cpp'],
override_options: [
'cython_language=cpp',
# Temporary workaround for https://github.com/linbox-team/linbox/issues/306
'cpp_std=c++11',
],
include_directories: [inc_flint],
dependencies: [py_dep, blas, flint, fplll, givaro, gmp, gmpxx, linbox],
)
Expand Down
14 changes: 13 additions & 1 deletion src/sage/matrix/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,24 @@ extension_data_cpp = {
}

foreach name, pyx : extension_data_cpp
override_options = ['cython_language=cpp']
if name in [
'matrix_integer_dense',
'matrix_integer_sparse',
'matrix_modn_dense_float',
'matrix_modn_dense_double',
'matrix_modn_sparse',
]
# Temporary workaround for https://github.com/linbox-team/linbox/issues/306
override_options += ['cpp_std=c++11']
endif

py.extension_module(
name,
sources: pyx,
subdir: 'sage/matrix',
install: true,
override_options: ['cython_language=cpp'],
override_options: override_options,
include_directories: [
inc_cpython,
inc_ext,
Expand Down
Loading