On Thu, 9 Nov 2023, John Snow wrote:
On Thu, Nov 9, 2023 at 12:01 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
We need meson v1.2.3 to build QEMU on macOS Sonoma.
It also build fine all our CI jobs, so let's use it as our
"good enough" packaged wheel.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1939
Suggested-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
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 +-
3 files changed, 1 insertion(+), 1 deletion(-)
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
So these are packaged with the source. I did not know that. Now I get what
you mean by s/downolads/installs/ in your reply. But then this is disabled
by --disable-download but actually downloading avocado isn't? Confusing.
Regards,
BALATON Zoltan
diff --git a/pythondeps.toml b/pythondeps.toml
index 0a35ebcf9f..a2f8c1980b 100644
--- a/pythondeps.toml
+++ b/pythondeps.toml
@@ -18,7 +18,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 = ">=1.2.3", installed = "1.2.3", canary = "meson" }
We don't need to block older versions of Meson, and indeed we don't
want to because it's fine to use the distro package everywhere
(including Sonoma). (So the subject would become would be
"buildsys: Bump known good meson version to v1.2.3).
You can look at sphinx below for another case where the accepted
versions are much older than the installed one.
If there's anything you'd like to add to the (just sent) documentation
to clarify this, please help.
Paolo
[docs]
sphinx = { accepted = ">=1.6", installed = "5.3.0", canary = "sphinx-build" }
I'd like you to also bump the version in the python/scripts/vendor.py
script. You may have obtained it by other means, but I like
documenting precisely where these .whl files come from in the form of
the script.
