Skip to content

Commit f0dea39

Browse files
author
Release Manager
committed
sagemathgh-40071: Meson: make it compile on recent ubuntu <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> Successfully install sage with meson on recent ubuntu (like 25.04), only with system packages pre-installed. Ubuntu is missing maxima (with ecl), so we have to add maxima as a subproject that is build on-the-fly. Also make the python dep lrcalc an optional dependency, since it fails to build (due to missing lrcalc). The other changes are mostly minor updates to the dependency installing and handling in meson. Fixes sagemath#31347. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies - sagemath#40038 <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#40071 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik, Tobias Diez
2 parents bc0ffc7 + de5e820 commit f0dea39

File tree

56 files changed

+398
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+398
-570
lines changed

.devcontainer/onCreate-meson.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ uv venv
2020
uv pip install \
2121
meson-python \
2222
"cypari2 >=2.2.1" \
23-
"cython >=3.0, != 3.0.3, != 3.1.0" \
24-
"cython >=3.0, != 3.0.3" \
23+
"cysignals >=1.11.2, != 1.12.0" \
24+
"cython >=3.0, != 3.0.3, < 3.1.0" \
2525
"gmpy2 ~=2.1.b999" \
2626
memory_allocator \
2727
"numpy >=1.25" \
2828
jinja2 \
29-
setuptool
30-
uv sync --frozen --inexact --no-build-isolation
29+
setuptools
30+
uv sync --frozen --inexact --no-build-isolation --config-settings=builddir=build/build-$SYSTEM
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "ubuntu-22.04",
4+
"image": "ubuntu:22.04",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "ubuntu-24.04",
4+
"image": "ubuntu:24.04",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "ubuntu-25.04",
4+
"image": "ubuntu:25.04",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}
19+
}
20+
}

.devcontainer/portability-ubuntu-bionic-gcc_8-i386-minimal/devcontainer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

.devcontainer/portability-ubuntu-bionic-gcc_8-i386-minimal/portability-Dockerfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

.devcontainer/portability-ubuntu-bionic-gcc_8-i386-standard/devcontainer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

.devcontainer/portability-ubuntu-bionic-gcc_8-i386-standard/portability-Dockerfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

.devcontainer/portability-ubuntu-bionic-gcc_8-minimal/devcontainer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

.devcontainer/portability-ubuntu-bionic-gcc_8-minimal/portability-Dockerfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)