Browse Source

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>
pull/272/head
Paolo Bonzini 2 years ago
parent
commit
07f0d32641
  1. 2
      meson.build
  2. 4
      python/scripts/vendor.py
  3. BIN
      python/wheels/meson-1.2.3-py3-none-any.whl
  4. BIN
      python/wheels/meson-1.5.0-py3-none-any.whl
  5. 2
      pythondeps.toml
  6. 2
      tests/docker/dockerfiles/opensuse-leap.docker
  7. 2
      tests/lcitool/mappings.yml

2
meson.build

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

4
python/scripts/vendor.py

@ -41,8 +41,8 @@ def main() -> int:
parser.parse_args()
packages = {
"meson==1.2.3":
"4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1",
"meson==1.5.0":
"52b34f4903b882df52ad0d533146d4b992c018ea77399f825579737672ae7b20",
}
vendor_dir = Path(__file__, "..", "..", "wheels").resolve()

BIN
python/wheels/meson-1.2.3-py3-none-any.whl

Binary file not shown.

BIN
python/wheels/meson-1.5.0-py3-none-any.whl

Binary file not shown.

2
pythondeps.toml

@ -19,7 +19,7 @@
[meson]
# 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" }
[docs]

2
tests/docker/dockerfiles/opensuse-leap.docker

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

2
tests/lcitool/mappings.yml

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

Loading…
Cancel
Save