aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-08-08 20:19:43 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-08-28 09:55:48 +0200
commitedc2107895007d621fe474d58bcb99036c8e55d2 (patch)
tree8e1efc72f064ddd0f0cc3431fa555553479c7942 /configure
parent7c3fb52bcdaef85b15a91b3ca4d1516f9d9b5402 (diff)
python: use vendored tomli
Debian only introduced tomli in the bookworm release. Use a vendored wheel to avoid requiring a package that is only in bullseye-backports and is also absent in Ubuntu 20.04. While at it, fix an issue in the vendor.py scripts which does not add a newline after each package and hash. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure b/configure
index f13f0662b9..347153702c 100755
--- a/configure
+++ b/configure
@@ -1018,6 +1018,12 @@ fi
python="$python -B"
mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
+# Finish preparing the virtual environment using vendored .whl files
+
+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
if ! $mkvenv ensure \
--dir "${source_path}/python/wheels" \
--diagnose "meson" \