Require meson version 1.5.0

This is needed for Rust support.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Link: https://lore.kernel.org/r/74e1eb4b13717d061c5ad9c198bf56951fbfc14f.1727961605.git.manos.pitsidianakis@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-10-03 16:28:43 +03:00
parent b5ab62b3c0
commit 07f0d32641
7 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
project('qemu', ['c'], meson_version: '>=1.1.0', project('qemu', ['c'], meson_version: '>=1.5.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==1.2.3": "meson==1.5.0":
"4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1", "52b34f4903b882df52ad0d533146d4b992c018ea77399f825579737672ae7b20",
} }
vendor_dir = Path(__file__, "..", "..", "wheels").resolve() vendor_dir = Path(__file__, "..", "..", "wheels").resolve()

Binary file not shown.

View File

@ -19,7 +19,7 @@
[meson] [meson]
# The install key should match the version in python/wheels/ # The install key should match the version in python/wheels/
meson = { accepted = ">=1.1.0", installed = "1.2.3", canary = "meson" } meson = { accepted = ">=1.5.0", installed = "1.5.0", canary = "meson" }
pycotap = { accepted = ">=1.1.0", installed = "1.3.1" } pycotap = { accepted = ">=1.1.0", installed = "1.3.1" }
[docs] [docs]

View File

@ -127,7 +127,7 @@ RUN zypper update -y && \
RUN /usr/bin/pip3.11 install \ RUN /usr/bin/pip3.11 install \
PyYAML \ PyYAML \
meson==0.63.2 \ meson==1.5.0 \
pillow \ pillow \
sphinx \ sphinx \
sphinx-rtd-theme sphinx-rtd-theme

View File

@ -89,7 +89,7 @@ mappings:
pypi_mappings: pypi_mappings:
# Request more recent version # Request more recent version
meson: meson:
default: meson==0.63.2 default: meson==1.5.0
# Drop packages that need devel headers # Drop packages that need devel headers
python3-numpy: python3-numpy: