qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: jsnow@redhat.com, peter.maydell@linaro.org, thuth@redhat.com,
	alex.bennee@linaro.org, armbru@redhat.com, berrange@redhat.com
Subject: [PATCH 04/10] configure: protect against escaping venv when running Meson
Date: Wed, 22 Feb 2023 15:37:46 +0100	[thread overview]
Message-ID: <20230222143752.466090-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20230222143752.466090-1-pbonzini@redhat.com>

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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 00415f0b48d7..4d66a958023e 100755
--- a/configure
+++ b/configure
@@ -1047,8 +1047,18 @@ fi
 # Suppress writing compiled files
 python="$python -B"
 
+has_meson() {
+  if test "${VIRTUAL_ENV:+set}" = set; then
+    # Ensure that Meson and Python come from the same virtual environment
+    test -x "${VIRTUAL_ENV}/bin/meson" &&
+      test "$(command -v meson)" -ef "${VIRTUAL_ENV}/bin/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



  parent reply	other threads:[~2023-02-22 14:40 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-22 14:37 [PATCH v4 0/9] improvement to Python detection, preparation for dropping 3.6 Paolo Bonzini
2023-02-22 14:37 ` [PATCH 01/10] python: support pylint 2.16 Paolo Bonzini
2023-02-22 14:37 ` [PATCH 02/10] python: drop pipenv Paolo Bonzini
2023-03-15 21:16   ` Philippe Mathieu-Daudé
2023-03-15 23:02     ` John Snow
2023-03-16  8:54       ` Philippe Mathieu-Daudé
2023-03-16 10:49         ` Jan Richter
2023-03-16 14:26         ` John Snow
2023-02-22 14:37 ` [PATCH 03/10] meson: prefer 'sphinx-build' to 'sphinx-build-3' Paolo Bonzini
2023-02-22 16:26   ` Markus Armbruster
2023-02-22 16:53     ` Paolo Bonzini
2023-02-22 14:37 ` Paolo Bonzini [this message]
2023-02-22 15:04   ` [PATCH 04/10] configure: protect against escaping venv when running Meson Daniel P. Berrangé
2023-02-22 15:25     ` Paolo Bonzini
2023-02-22 14:37 ` [PATCH 05/10] configure: Look for auxiliary Python installations Paolo Bonzini
2023-02-22 15:19   ` Daniel P. Berrangé
2023-02-22 14:37 ` [PATCH 06/10] lcitool: update submodule Paolo Bonzini
2023-02-22 15:07   ` Daniel P. Berrangé
2023-02-22 14:37 ` [PATCH 07/10] docs/devel: update and clarify lcitool instructions Paolo Bonzini
2023-02-22 15:11   ` Daniel P. Berrangé
2023-02-22 14:37 ` [PATCH 08/10] ci, docker: update CentOS and OpenSUSE Python to non-EOL versions Paolo Bonzini
2023-02-22 15:14   ` Daniel P. Berrangé
2023-02-22 14:37 ` [PATCH 09/10] Python: Drop support for Python 3.6 Paolo Bonzini
2023-02-22 15:16   ` Daniel P. Berrangé
2023-02-22 15:28     ` Paolo Bonzini
2023-02-22 16:31   ` Markus Armbruster
2023-02-22 17:02     ` Paolo Bonzini
2023-03-13 17:05   ` Daniel P. Berrangé
2023-03-15 12:53     ` Thomas Huth
2023-02-22 14:37 ` [PATCH 10/10] configure: Add courtesy hint to Python version failure message Paolo Bonzini
2023-03-21 14:11 ` [PATCH v4 0/9] improvement to Python detection, preparation for dropping 3.6 Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230222143752.466090-5-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).