From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 4/6] buildsys: Bump known good meson version to v1.2.3
Date: Sat, 11 Nov 2023 16:29:21 +0100 [thread overview]
Message-ID: <20231111152923.966998-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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 | 4 ++--
python/wheels/meson-0.63.3-py3-none-any.whl | Bin 926526 -> 0 bytes
python/wheels/meson-1.2.3-py3-none-any.whl | Bin 0 -> 964928 bytes
pythondeps.toml | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 python/wheels/meson-0.63.3-py3-none-any.whl
create mode 100644 python/wheels/meson-1.2.3-py3-none-any.whl
diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py
index 76274871170..1038b14ae0c 100755
--- a/python/scripts/vendor.py
+++ b/python/scripts/vendor.py
@@ -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
index 8a191e3a200eba6783297676729ec85ceb96f89d..0000000000000000000000000000000000000000
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
index 0000000000000000000000000000000000000000..a8b84e5f114ad3fbec8ae56008426a90bccfc168
GIT binary patch
Binary files /dev/null and b/python/wheels/meson-1.2.3-py3-none-any.whl differ
diff --git a/pythondeps.toml b/pythondeps.toml
index 4beadfd96f5..0e884159993 100644
--- a/pythondeps.toml
+++ b/pythondeps.toml
@@ -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" }
--
2.41.0
next prev parent reply other threads:[~2023-11-11 15:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-11 15:29 [PULL 0/6] Biuld system and CI changes for 2023-11-10 Paolo Bonzini
2023-11-11 15:29 ` [PULL 1/6] coverity: physmem: use simple assertions instead of modelling Paolo Bonzini
2023-11-11 15:29 ` [PULL 2/6] tests: respect --enable/--disable-download for Avocado Paolo Bonzini
2023-11-11 15:29 ` [PULL 3/6] docs: document what configure does with virtual environments Paolo Bonzini
2023-11-11 15:29 ` Paolo Bonzini [this message]
2023-11-11 15:29 ` [PULL 5/6] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura) Paolo Bonzini
2023-11-11 15:29 ` [PULL 6/6] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma) Paolo Bonzini
2023-11-12 18:06 ` [PULL 0/6] Biuld system and CI changes for 2023-11-10 Stefan Hajnoczi
2023-11-14 13:54 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231111152923.966998-5-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).