[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [NOTFORMERGE PATCH 1/2] configure: Use distrib meson
|
From: |
Peter Maydell |
|
Subject: |
Re: [NOTFORMERGE PATCH 1/2] configure: Use distrib meson |
|
Date: |
Wed, 8 Nov 2023 19:01:48 +0000 |
On Wed, 8 Nov 2023 at 18:33, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> 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)"
Presumably the other approach would be to make the pythondeps.toml
say "on macos we need at least version X of meson" ?
Do we know what the upstream meson issue is that we're running into
with the older version on this host ?
thanks
-- PMM