From nobody Mon Feb 9 16:18:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682366714; cv=none; d=zohomail.com; s=zohoarc; b=hARvCxW8Bpu+yBf5wPGCrtPMQT7Q0grblX1lPpKD6/umgwWruAUzJXgqKTT2jVqIB6eEUwnA0z24EwuOkaeTA0XjQa9zLPbznGSTXL40HvXIHyQbHKWjWYC3YlGuNYk+AOkTWrRoS3bk2HmEx0n68PDPRKmH4ZFD+MO0rBs6LVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682366714; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=haSGhn7+xY1tMHPJbNzMnLnBuxDDJ9oSFBnOrY3sQsg=; b=cul/c/sj0SJKZL51oJGSk28P2SH1ND5RCiuDTi/PTJ/EE32pnHLxPQ45hMSBoT+fOtcqmF4dbo5x9VF2beHdaYrJJui9cIwF9MAME+JVt/rqO4FdSjOVogyphpX0WZKAUlCQzaFr5210qvcHeFvJ8qAc2R3jh0vOVWfMi8WimYI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682366714452967.6403272786408; Mon, 24 Apr 2023 13:05:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pr2Ox-0007qa-Gp; Mon, 24 Apr 2023 16:03:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pr2Ov-0007nk-Jn for qemu-devel@nongnu.org; Mon, 24 Apr 2023 16:03:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pr2Ou-0000y9-24 for qemu-devel@nongnu.org; Mon, 24 Apr 2023 16:03:05 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-102-7XstacTSNwi-nxAHOEDt1Q-1; Mon, 24 Apr 2023 16:02:59 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C5C2280BF61; Mon, 24 Apr 2023 20:02:59 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 975331121318; Mon, 24 Apr 2023 20:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682366583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=haSGhn7+xY1tMHPJbNzMnLnBuxDDJ9oSFBnOrY3sQsg=; b=O+vNrDu8iUKmnAMPInDJANB33XVz+u94xtHr+uu1j0fjmVoSFEpqCi+xlxObEMc95zeVTB vujmOdrsI0rAKZWkZVxwFqDjixosisHmZoXeIHClfBPQ8DtHkAQXnjl5Fr0MU2Y8WIlgFe 2Eg9/Stc6pIoYylBOnVQ34782HCTTvQ= X-MC-Unique: 7XstacTSNwi-nxAHOEDt1Q-1 From: John Snow To: qemu-devel@nongnu.org Cc: Warner Losh , Beraldo Leal , John Snow , Kyle Evans , Paolo Bonzini , Thomas Huth , Daniel Berrange , Reinoud Zandijk , Wainer dos Santos Moschetta , Cleber Rosa , Ryo ONODERA , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ani Sinha , "Michael S. Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v3 13/20] configure: create a python venv unconditionally Date: Mon, 24 Apr 2023 16:02:41 -0400 Message-Id: <20230424200248.1183394-14-jsnow@redhat.com> In-Reply-To: <20230424200248.1183394-1-jsnow@redhat.com> References: <20230424200248.1183394-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682366716088100002 Content-Type: text/plain; charset="utf-8" This patch changes the configure script so that it always creates and uses a python virtual environment unconditionally. Meson bootstrapping is temporarily altered to force the use of meson from git or vendored source. The next commit restores the use of distribution-vendored Meson. Signed-off-by: John Snow --- configure | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 77c03315f8..462fe604d6 100755 --- a/configure +++ b/configure @@ -625,7 +625,6 @@ check_py_version() { python=3D first_python=3D if test -z "${PYTHON}"; then - explicit_python=3Dno # A bare 'python' is traditionally python 2.x, but some distros # have it as python 3.x, so check in both places. for binary in python3 python python3.11 python3.10 python3.9 python3.8= python3.7 python3.6; do @@ -644,7 +643,6 @@ else # Same as above, but only check the environment variable. has "${PYTHON}" || error_exit "The PYTHON environment variable does no= t point to an executable" python=3D$(command -v "$PYTHON") - explicit_python=3Dyes if check_py_version "$python"; then # This one is good. first_python=3D @@ -729,7 +727,7 @@ for opt do ;; --install=3D*) ;; - --python=3D*) python=3D"$optarg" ; explicit_python=3Dyes + --python=3D*) python=3D"$optarg" ;; --skip-meson) skip_meson=3Dyes ;; @@ -1089,8 +1087,34 @@ if ! check_py_version "$python"; then "Use --python=3D/path/to/python to specify a supported Python." fi =20 -# Resolve PATH + suppress writing compiled files -python=3D"$(command -v "$python") -B" +# Resolve PATH +python=3D"$(command -v "$python")" +explicit_python=3Dyes + +# Create a Python virtual environment using our configured python. +# The stdout of this script will be the location of a symlink that +# points to the configured Python. +# Entry point scripts for pip, meson, and sphinx are generated if those +# packages are present. + +# Defaults assumed for now: +# - venv is cleared if it exists already; +# - venv is allowed to use system packages; +# - all setup is performed **offline**; +# - No packages are installed by default; +# - pip is not installed into the venv when possible, +# but ensurepip is called as a fallback when necessary. + +echo "python determined to be '$python'" +echo "python version: $($python --version)" + +python=3D"$($python -B "${source_path}/python/scripts/mkvenv.py" create --= gen pip,meson,sphinx pyvenv)" +if test "$?" -ne 0 ; then + error_exit "python venv creation failed" +fi + +# Suppress writing compiled files +python=3D"$python -B" =20 has_meson() { local python_dir=3D$(dirname "$python") @@ -1145,6 +1169,8 @@ case "$meson" in *) meson=3D$(command -v "$meson") ;; esac =20 +echo "MKVENV ok!" + # Probe for ninja =20 if test -z "$ninja"; then --=20 2.39.2