Skip to content

Commit 69dc7ad

Browse files
bonziniPatchew Applier
authored andcommitted
configure: bump Meson to 1.9.0 for use with Rust
Meson 1.9.0 provides mixed linking of Rust and C objects. As a side effect, this also allows adding dependencies with "sources: ..." files to Rust crates that use structured_sources(). It can also clean up up the meson.build files for Rust noticeably, but due to an issue with doctests (see mesonbuild/meson#14973) that will have to wait for 1.9.1. Signed-off-by: Paolo Bonzini <[email protected]> Message-Id: <[email protected]>
1 parent d085b09 commit 69dc7ad

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,12 +1184,12 @@ fi
11841184
# detect rust triple
11851185

11861186
meson_version=$($meson --version)
1187-
if test "$rust" != disabled && ! version_ge "$meson_version" 1.8.1; then
1187+
if test "$rust" != disabled && ! version_ge "$meson_version" 1.9.0; then
11881188
if test "$rust" = enabled; then
11891189
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
11901190
${source_path}/pythondeps.toml meson-rust || exit 1
11911191
else
1192-
echo "Rust needs Meson 1.8.1, disabling" 2>&1
1192+
echo "Rust needs Meson 1.9.0, disabling" 2>&1
11931193
rust=disabled
11941194
fi
11951195
fi

python/scripts/vendor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def main() -> int:
4141
parser.parse_args()
4242

4343
packages = {
44-
"meson==1.8.1":
45-
"374bbf71247e629475fc10b0bd2ef66fc418c2d8f4890572f74de0f97d0d42da",
44+
"meson==1.9.0":
45+
"45e51ddc41e37d961582d06e78c48e0f9039011587f3495c4d6b0781dad92357",
4646
}
4747

4848
vendor_dir = Path(__file__, "..", "..", "wheels").resolve()
-989 KB
Binary file not shown.
1010 KB
Binary file not shown.

pythondeps.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
[meson]
2121
# The install key should match the version in python/wheels/
22-
meson = { accepted = ">=1.5.0", installed = "1.8.1", canary = "meson" }
22+
meson = { accepted = ">=1.5.0", installed = "1.9.0", canary = "meson" }
2323
pycotap = { accepted = ">=1.1.0", installed = "1.3.1" }
2424

2525
[meson-rust]
2626
# The install key should match the version in python/wheels/
27-
meson = { accepted = ">=1.8.1", installed = "1.8.1", canary = "meson" }
27+
meson = { accepted = ">=1.9.0", installed = "1.9.0", canary = "meson" }
2828

2929
[docs]
3030
# Please keep the installed versions in sync with docs/requirements.txt

0 commit comments

Comments
 (0)