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>
This commit is contained in:
1 parent
7c3fb52bcd
commit
edc2107895
3 files changed
+10
-1
No files matched your search
@@ -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" \
|
||||
|
||||
Reference in new issue
Block a user