On 2024/03/26 21:40, Peter Maydell wrote:
On Tue, 26 Mar 2024 at 12:35, Akihiko Odaki <[email protected]> wrote:
We need meson v1.4.0 to fix MESONINTROSPECT quoting on Windows:
https://github.com/mesonbuild/meson/pull/12807
Signed-off-by: Akihiko Odaki <[email protected]>
---
python/scripts/vendor.py | 4 ++--
python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes
python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes
pythondeps.toml | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
--- 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 = "1.2.3", canary = "meson" }
+meson = { accepted = ">=0.63.0", installed = "1.4.0", canary = "meson" }
If we need 1.4.0 why does this still say we accept anything 0.63.0
or better ?
If we use shlex.split(), does that go wrong for pre-1.4.0
meson only on Windows, or is it broken for all platforms?
It is only needed for Windows.
(i.e. could we if we wanted to make the requirement
"1.4.0 for windows, 0.63.0 for others"?)
I just followed what commit 1a1e889f3576 ("buildsys: Bump known good
meson version to v1.2.3") did, which don't bump the accepted version.
But certainly we can do better and conditionally ensure meson==1.4.0 on
Windows in the configure script as commit edc210789500 ("python: use
vendored tomli") does.
Regards,
Akihiko Odaki
thanks
-- PMM
