From: Paolo Bonzini Date: Thu, 4 Dec 2025 10:58:23 +0000 (+0100) Subject: bump meson wheel to 1.10.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c04b6a48b15a478ff3f9d152592a0ba503a31e4;p=thirdparty%2Fqemu.git bump meson wheel to 1.10.0 This version includes several improvements and bugfixes for Rust. Signed-off-by: Paolo Bonzini --- diff --git a/configure b/configure index 82cace1bc9..55e0bd3425 100755 --- a/configure +++ b/configure @@ -1180,12 +1180,12 @@ fi # detect rust triple meson_version=$($meson --version) -if test "$rust" != disabled && ! version_ge "$meson_version" 1.9.0; then +if test "$rust" != disabled && ! version_ge "$meson_version" 1.10.0; then if test "$rust" = enabled; then $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ ${source_path}/pythondeps.toml meson-rust || exit 1 else - echo "Rust needs Meson 1.9.0, disabling" 2>&1 + echo "Rust needs Meson 1.10.0, disabling" 2>&1 rust=disabled fi fi diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 33ac7a45de..33b9b0b92b 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -41,8 +41,8 @@ def main() -> int: parser.parse_args() packages = { - "meson==1.9.0": - "45e51ddc41e37d961582d06e78c48e0f9039011587f3495c4d6b0781dad92357", + "meson==1.10.0": + "4b27aafce281e652dcb437b28007457411245d975c48b5db3a797d3e93ae1585", } vendor_dir = Path(__file__, "..", "..", "wheels").resolve() diff --git a/python/wheels/meson-1.10.0-py3-none-any.whl b/python/wheels/meson-1.10.0-py3-none-any.whl new file mode 100644 index 0000000000..2b4a73a5ff Binary files /dev/null and b/python/wheels/meson-1.10.0-py3-none-any.whl differ diff --git a/pythondeps.toml b/pythondeps.toml index 98e99e7900..9a096160e6 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,12 +19,12 @@ [meson] # The install key should match the version in python/wheels/ -meson = { accepted = ">=1.5.0", installed = "1.9.0", canary = "meson" } +meson = { accepted = ">=1.5.0", installed = "1.10.0", canary = "meson" } pycotap = { accepted = ">=1.1.0", installed = "1.3.1" } [meson-rust] # The install key should match the version in python/wheels/ -meson = { accepted = ">=1.9.0", installed = "1.9.0", canary = "meson" } +meson = { accepted = ">=1.10.0", installed = "1.10.0", canary = "meson" } [docs] # Please keep the installed versions in sync with docs/requirements.txt