Skip to content

Commit

Permalink
buildsys: Bump known good meson version to v1.2.3
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
philmd authored and bonzini committed Nov 24, 2023
1 parent 6dc8a88 commit 1a1e889
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions python/scripts/vendor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file removed python/wheels/meson-0.63.3-py3-none-any.whl
Binary file not shown.
Binary file added python/wheels/meson-1.2.3-py3-none-any.whl
Binary file not shown.
2 changes: 1 addition & 1 deletion pythondeps.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down

0 comments on commit 1a1e889

Please sign in to comment.