Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bonzini committed May 17, 2023
1 parent 72147d5 commit 276358e
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configure
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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'))
Expand Down
4 changes: 2 additions & 2 deletions python/scripts/vendor.py
Expand Up @@ -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()
Expand Down
Binary file removed python/wheels/meson-0.61.5-py3-none-any.whl
Binary file not shown.
Binary file added python/wheels/meson-0.63.3-py3-none-any.whl
Binary file not shown.

0 comments on commit 276358e

Please sign in to comment.