OSDN Git Service

buildsys: Bump known good meson version to v1.2.3
authorPhilippe Mathieu-Daudé <philmd@linaro.org>
Thu, 9 Nov 2023 16:05:02 +0000 (17:05 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 24 Nov 2023 15:21:55 +0000 (16:21 +0100)
We need meson v1.2.3 to build QEMU on macOS Sonoma.  It
also builds fine all our CI jobs (as tested by also bumping
"accepted" in pythondeps.toml), so let's use it as our
"good enough" packaged wheel.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1939
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231109160504.93677-2-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
python/scripts/vendor.py
python/wheels/meson-0.63.3-py3-none-any.whl [deleted file]
python/wheels/meson-1.2.3-py3-none-any.whl [new file with mode: 0644]
pythondeps.toml

index 7627487..1038b14 100755 (executable)
@@ -41,8 +41,8 @@ def main() -> int:
     parser.parse_args()
 
     packages = {
-        "meson==0.63.3":
-        "d677b809c4895dcbaac9bf6c43703fcb3609a4b24c6057c78f828590049cf43a",
+        "meson==1.2.3":
+        "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1",
 
         "tomli==2.0.1":
         "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
diff --git a/python/wheels/meson-0.63.3-py3-none-any.whl b/python/wheels/meson-0.63.3-py3-none-any.whl
deleted file mode 100644 (file)
index 8a191e3..0000000
Binary files a/python/wheels/meson-0.63.3-py3-none-any.whl and /dev/null differ
diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl
new file mode 100644 (file)
index 0000000..a8b84e5
Binary files /dev/null and b/python/wheels/meson-1.2.3-py3-none-any.whl differ
index 4beadfd..0e88415 100644 (file)
@@ -19,7 +19,7 @@
 
 [meson]
 # The install key should match the version in python/wheels/
-meson = { accepted = ">=0.63.0", installed = "0.63.3", canary = "meson" }
+meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" }
 
 [docs]
 sphinx = { accepted = ">=1.6", installed = "5.3.0", canary = "sphinx-build" }