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>
This commit is contained in:
Paolo Bonzini 2021-12-23 15:29:56 +01:00
parent 5fbfea6c9d
commit 3b087f79a4
5 changed files with 4 additions and 4 deletions

2
configure vendored
View file

@ -1136,7 +1136,7 @@ if ! $mkvenv ensure \
$mkvenv_flags \ $mkvenv_flags \
--dir "${source_path}/python/wheels" \ --dir "${source_path}/python/wheels" \
--diagnose "meson" \ --diagnose "meson" \
"meson>=0.61.5" ; "meson>=0.63.0" ;
then then
exit 1 exit 1
fi fi

View file

@ -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', 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'], 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'],
version: files('VERSION')) version: files('VERSION'))

View file

@ -41,8 +41,8 @@ def main() -> int:
parser.parse_args() parser.parse_args()
packages = { packages = {
"meson==0.61.5": "meson==0.63.3":
"58c2ddb5f885da0e929f15d89f38d8a7d97f981f56815bcba008414f8511f59a", "d677b809c4895dcbaac9bf6c43703fcb3609a4b24c6057c78f828590049cf43a",
} }
vendor_dir = Path(__file__, "..", "..", "wheels").resolve() vendor_dir = Path(__file__, "..", "..", "wheels").resolve()

Binary file not shown.