meson: require 0.63.0

This version allows cleanups in modinfo collection, but they only
work with Ninja 1.9.x and 1.8.x is still supported.  It also supports the
equivalent of QEMU's --static option to configure.

The wheel file is bumped to 0.63.3, the last release in the 0.63 branch.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/configure b/configure
index 1ce0e48f31cbf5d353d81cf4c0e2b72153aca7bb..590c7717bced0bd342d389e2316f84876ad7b542 100755 (executable)
--- a/configure
+++ b/configure
@@ -1136,7 +1136,7 @@ if ! $mkvenv ensure \
      $mkvenv_flags \
      --dir "${source_path}/python/wheels" \
      --diagnose "meson" \
-     "meson>=0.61.5" ;
+     "meson>=0.63.0" ;
 then
     exit 1
 fi

diff --git a/meson.build b/meson.build
index 4dddccb89006a3080a81613d7b2913dddd61932a..d85637edf1bba51784d75829535132fd6ce0d574 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('qemu', ['c'], meson_version: '>=0.61.3',
+project('qemu', ['c'], meson_version: '>=0.63.0',
         default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto',
                           'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'],
         version: files('VERSION'))

diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py
index 23708430ea684a83ccb0dba07c9fe38b854828e9..34486a51f445d8be109ae2eb97f9d9d6c1a5e6b1 100755 (executable)
--- a/python/scripts/vendor.py
+++ b/python/scripts/vendor.py
@@ -41,8 +41,8 @@ def main() -> int:
     parser.parse_args()
 
     packages = {
-        "meson==0.61.5":
-        "58c2ddb5f885da0e929f15d89f38d8a7d97f981f56815bcba008414f8511f59a",
+        "meson==0.63.3":
+        "d677b809c4895dcbaac9bf6c43703fcb3609a4b24c6057c78f828590049cf43a",
     }
 
     vendor_dir = Path(__file__, "..", "..", "wheels").resolve()

diff --git a/python/wheels/meson-0.61.5-py3-none-any.whl b/python/wheels/meson-0.61.5-py3-none-any.whl
deleted file mode 100644 (file)
index 04a336a..0000000
Binary files a/python/wheels/meson-0.61.5-py3-none-any.whl and /dev/null differ

diff --git a/python/wheels/meson-0.63.3-py3-none-any.whl b/python/wheels/meson-0.63.3-py3-none-any.whl
new file mode 100644 (file)
index 0000000..8a191e3
Binary files /dev/null and b/python/wheels/meson-0.63.3-py3-none-any.whl differ