[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[NOTFORMERGE PATCH 1/2] configure: Use distrib meson
From: |
Philippe Mathieu-Daudé |
Subject: |
[NOTFORMERGE PATCH 1/2] configure: Use distrib meson |
Date: |
Wed, 8 Nov 2023 19:32:50 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
configure | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/configure b/configure
index f1456f6123..93735b7661 100755
--- a/configure
+++ b/configure
@@ -955,15 +955,8 @@ if $python -c 'import sys; sys.exit(sys.version_info >=
(3,11))'; then
$mkvenv ensure --dir "${source_path}/python/wheels" \
'tomli>=1.2.0' || exit 1
fi
-$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
- ${source_path}/pythondeps.toml meson || exit 1
-# At this point, we expect Meson to be installed and available.
-# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
-# We ignore PATH completely here: we want to use the venv's Meson
-# *exclusively*.
-
-meson="$(cd pyvenv/bin; pwd)/meson"
+meson="$(which meson)"
# Conditionally ensure Sphinx is installed.
--
2.41.0