aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-12-23 15:29:56 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2023-05-18 08:53:51 +0200
commit3b087f79a48807f348ea61469175e66b28ba44de (patch)
treeeadaf5871379d4dfc0869232f1d64650918c9d71
parent5fbfea6c9dc35536c0fe572bb92c32bb45b177cb (diff)
downloadqemu-3b087f79a48807f348ea61469175e66b28ba44de.zip
qemu-3b087f79a48807f348ea61469175e66b28ba44de.tar.gz
qemu-3b087f79a48807f348ea61469175e66b28ba44de.tar.bz2
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>
-rwxr-xr-xconfigure2
-rw-r--r--meson.build2
-rwxr-xr-xpython/scripts/vendor.py4
-rw-r--r--python/wheels/meson-0.61.5-py3-none-any.whlbin862509 -> 0 bytes
-rw-r--r--python/wheels/meson-0.63.3-py3-none-any.whlbin0 -> 926526 bytes
5 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 1ce0e48..590c771 100755
--- 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 4dddccb..d85637e 100644
--- 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 2370843..34486a5 100755
--- 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
index 04a336a..0000000
--- a/python/wheels/meson-0.61.5-py3-none-any.whl
+++ /dev/null
Binary files 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
index 0000000..8a191e3
--- /dev/null
+++ b/python/wheels/meson-0.63.3-py3-none-any.whl
Binary files differ