[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/13] configure: protect against escaping venv when running Meson
From: |
Paolo Bonzini |
Subject: |
[PULL 04/13] configure: protect against escaping venv when running Meson |
Date: |
Mon, 27 Feb 2023 18:55:15 +0100 |
If neither --python nor --meson are specified, Meson's generated
build.ninja will invoke Python script using the interpreter *that Meson
itself is running under*; not the one identified by configure.
This is only an issue if Meson's Python interpreter is not "the first
one in the path", which is the one that is used if --python is not
specified. A common case where this happen is when the "python3" binary
comes from a virtual environment but Meson is not installed (with pip)
in the virtual environment. In this case (presumably) whoever set up
the venv wanted to use the venv's Python interpreter to build QEMU,
while Meson might use a different one, for example an enterprise
distro's older runtime.
So, detect whether a virtual environment is setup, and if the virtual
environment does not have Meson, use the meson submodule. Meson will
then run under the virtual environment's Python interpreter.
Reported-by: John Snow <jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index cf6db3d5518c..a1912463c94e 100755
--- a/configure
+++ b/configure
@@ -1044,11 +1044,24 @@ if ! $python -c 'import sys; sys.exit(sys.version_info
< (3,6))'; then
"Use --python=/path/to/python to specify a supported Python."
fi
-# Suppress writing compiled files
-python="$python -B"
+# Resolve PATH + suppress writing compiled files
+python="$(command -v "$python") -B"
+
+has_meson() {
+ local python_dir=$(dirname "$python")
+ # PEP405: pyvenv.cfg is either adjacent to the Python executable
+ # or one directory above
+ if test -f $python_dir/pyvenv.cfg || test -f $python_dir/../pyvenv.cfg; then
+ # Ensure that Meson and Python come from the same virtual environment
+ test -x "$python_dir/meson" &&
+ test "$(command -v meson)" -ef "$python_dir/meson"
+ else
+ has meson
+ fi
+}
if test -z "$meson"; then
- if test "$explicit_python" = no && has meson && version_ge "$(meson
--version)" 0.61.5; then
+ if test "$explicit_python" = no && has_meson && version_ge "$(meson
--version)" 0.61.5; then
meson=meson
elif test "$git_submodules_action" != 'ignore' ; then
meson=git
--
2.39.1
- [PULL 00/13] build, Python, target/i386 changes for 2023-02-27, Paolo Bonzini, 2023/02/27
- [PULL 01/13] target/i386: Fix BZHI instruction, Paolo Bonzini, 2023/02/27
- [PULL 02/13] meson: Avoid duplicates in generated config-poison.h again, Paolo Bonzini, 2023/02/27
- [PULL 03/13] meson: stop looking for 'sphinx-build-3', Paolo Bonzini, 2023/02/27
- [PULL 04/13] configure: protect against escaping venv when running Meson,
Paolo Bonzini <=
- [PULL 05/13] configure: Look for auxiliary Python installations, Paolo Bonzini, 2023/02/27
- [PULL 06/13] lcitool: update submodule, Paolo Bonzini, 2023/02/27
- [PULL 07/13] docs/devel: update and clarify lcitool instructions, Paolo Bonzini, 2023/02/27
- [PULL 08/13] ci, docker: update CentOS and OpenSUSE Python to non-EOL versions, Paolo Bonzini, 2023/02/27
- [PULL 09/13] MAINTAINERS: Cover RCU documentation, Paolo Bonzini, 2023/02/27
- [PULL 10/13] target/i386: add FSRM to TCG, Paolo Bonzini, 2023/02/27
- [PULL 11/13] target/i386: add FZRM, FSRS, FSRC, Paolo Bonzini, 2023/02/27
- [PULL 12/13] target/i386: KVM: allow fast string operations if host supports them, Paolo Bonzini, 2023/02/27
- Re: [PULL 00/13] build, Python, target/i386 changes for 2023-02-27, Peter Maydell, 2023/02/28