diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-10-03 16:28:43 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-10-07 16:41:57 +0200 |
| commit | 07f0d32641e04703e6ed9626d06179060ea772ca (patch) | |
| tree | 040eb1bde312357e0683e267066d7510d88df060 | |
| parent | b5ab62b3c0050612c7f9b0b4baeb44ebab42775a (diff) | |
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>
| -rw-r--r-- | meson.build | 2 | ||||
| -rwxr-xr-x | python/scripts/vendor.py | 4 | ||||
| -rw-r--r-- | python/wheels/meson-1.2.3-py3-none-any.whl | bin | 964928 -> 0 bytes | |||
| -rw-r--r-- | python/wheels/meson-1.5.0-py3-none-any.whl | bin | 0 -> 959846 bytes | |||
| -rw-r--r-- | pythondeps.toml | 2 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/opensuse-leap.docker | 2 | ||||
| -rw-r--r-- | tests/lcitool/mappings.yml | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 67d045eb5a..e6a65463ff 100644 --- a/meson.build +++ b/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')) diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 07aff97cca..0405e910b4 100755 --- a/python/scripts/vendor.py +++ b/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() diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl Binary files differdeleted file mode 100644 index a8b84e5f11..0000000000 --- a/python/wheels/meson-1.2.3-py3-none-any.whl +++ /dev/null diff --git a/python/wheels/meson-1.5.0-py3-none-any.whl b/python/wheels/meson-1.5.0-py3-none-any.whl Binary files differnew file mode 100644 index 0000000000..c7edeb37ad --- /dev/null +++ b/python/wheels/meson-1.5.0-py3-none-any.whl diff --git a/pythondeps.toml b/pythondeps.toml index 0a7f69b196..c03c9df81b 100644 --- a/pythondeps.toml +++ b/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] diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 66143621fe..a64fcacae2 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/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 diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 0ab3a89013..9c5ac87c1c 100644 --- a/tests/lcitool/mappings.yml +++ b/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: |