From 101ed0b7515d0bf9c512adf6d004bc4479684923 Mon Sep 17 00:00:00 2001 From: Mark Pryor Date: Tue, 28 Jan 2025 11:01:52 -0800 Subject: [PATCH] qemu: python venv not used for meson Signed-off-by: Mark Pryor --- tools/qemu-xen/configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/qemu-xen/configure b/tools/qemu-xen/configure index d08b71f1..014a7a71 100755 --- a/tools/qemu-xen/configure +++ b/tools/qemu-xen/configure @@ -944,19 +944,21 @@ python="$(command -v "$python")" echo "python determined to be '$python'" echo "python version: $($python --version)" -python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)" +#python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)" +python=python3 if test "$?" -ne 0 ; then error_exit "python venv creation failed" fi # Suppress writing compiled files python="$python -B" -mkvenv="$python ${source_path}/python/scripts/mkvenv.py" +#mkvenv="$python ${source_path}/python/scripts/mkvenv.py" +mkvenv=true # Finish preparing the virtual environment using vendored .whl files -$mkvenv ensuregroup --dir "${source_path}/python/wheels" \ - ${source_path}/pythondeps.toml meson || exit 1 +#$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. @@ -965,7 +965,8 @@ mkvenv=true # We ignore PATH completely here: we want to use the venv's Meson # *exclusively*. -meson="$(cd pyvenv/bin; pwd)/meson" +#meson="$(cd pyvenv/bin; pwd)/meson" +meson="/usr/bin/meson" # Conditionally ensure Sphinx is installed. -- 2.47.1