From nobody Mon Feb 9 08:57:55 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=1684486676; cv=none; d=zohomail.com; s=zohoarc; b=C9jFnTqRr7tZ+AF+1aHsHO/C52pvrXdCn538B81vzp6t8Ctes5y5I8xTNMSMVrWVJGOdR0u0v7P965K+UOE4BOLf9+1NHDLgofr5IRc7X/8munmjcRfdHV4XwFTaFXkIshuIE47VSj7hyryny/Jen6dJ6YOqeAnEMLoGJzKKuc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684486676; h=Content-Type: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=EWnHqrDaDrc0Yt2ijn7nY1ZzzrQQlpfEkdayY9n7Fm8=; b=k/34mEntMwfZ1M5RdnBJ2fbxuRf7xALhGLieufRE3WSjXgTsCCsAi3gkl36gTlSwrRB+lCdwsOeUIQE0Bmg//LObFWLacKP8O/OqXgdFEIAMd2lYfAGMVLDPugmDo67fN5J5fn3DtzOOEFORV41g3Vu7UG6Ch+n8kdpUr4m2liU= 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 1684486676592262.8640632916587; Fri, 19 May 2023 01:57:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzvv6-0002F3-IA; Fri, 19 May 2023 04:57:04 -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 1pzvv4-0002EQ-AI for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzvv2-0000Bl-Pe for qemu-devel@nongnu.org; Fri, 19 May 2023 04:57:02 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-1yb-BZGMOnSAbze_Ww_alg-1; Fri, 19 May 2023 04:56:59 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-969f24626fbso88304666b.0 for ; Fri, 19 May 2023 01:56:58 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id j25-20020a170906095900b009584c5bcbc7sm1997474ejd.49.2023.05.19.01.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 01:56:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684486620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EWnHqrDaDrc0Yt2ijn7nY1ZzzrQQlpfEkdayY9n7Fm8=; b=Z8thayzFELvO8l6Z11tkXuyyeEkG99ec6nJv+EY29aJE/YzhTHmMDKz1AgQ3y0Du8tmW+Y FtkvXtXYtQutKKDCBtd4J/TNNONuzQzFBAeJJ8tVG6Kz28C8nb7ti2Y64cSkj7PS3JofT9 uRwiYMNLfmSeukfLyxVu+LvyXbIuWnw= X-MC-Unique: 1yb-BZGMOnSAbze_Ww_alg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684486617; x=1687078617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EWnHqrDaDrc0Yt2ijn7nY1ZzzrQQlpfEkdayY9n7Fm8=; b=g2n/hMu2YEOH6vfxZs5lxiTUBDu2RTEKSYNsZEJ/K2BembG5zaDFfss5IX1F7c3aBP yAKx7iIMKy+svBpLEMNblEiesiaEJxm1Ctkyvj3joTVtdWWqsy0Yne/MHl1gZHXMytuz 3j6H7CL9yz9fGRkVYinmVY8N5bxk/CebSftI+sDTPdOBDiB291GnOw9YWpO2wRoxXrIp UYqBVuOvkTdJNksCW5dvtbWxN6dQ2M60Fxcy3mGyDbaEAG5hKA47yDXvp4C6SQDJs93C NO3I24MKerC3UQ5iYNp0TcBb7iKWDGMVKTLxdvrItLtkG3JHcRrUtsgh4Xb3ADBLdGMa NWVA== X-Gm-Message-State: AC+VfDzE0Gtd9XlMF2hcBcLdlZA66LSgtk9jnpw1jt4QVTU9ogcxPAwd mL8+aiuVa/IPh4j3jz41i3s0BBtdKLj5MlUMNJ2MfgKY788QIrnlWaKyRcx0PEwdtq8n3piu4om VWffMyxiinOIn8BU3nly8nFNggQBBpo7GysNe6wo4gOEdGyBB0OW27W1K7baSTf/+0ssOYaE6RJ A= X-Received: by 2002:a17:907:7ea3:b0:966:399e:a5a5 with SMTP id qb35-20020a1709077ea300b00966399ea5a5mr1113946ejc.35.1684486617350; Fri, 19 May 2023 01:56:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60IeLdyeZY3Q82G3GIe82pbRrtYEceMpGEAip2XIHVvNUPfAv81t59HzLsShhwTminXf5Qfw== X-Received: by 2002:a17:907:7ea3:b0:966:399e:a5a5 with SMTP id qb35-20020a1709077ea300b00966399ea5a5mr1113926ejc.35.1684486616982; Fri, 19 May 2023 01:56:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, peter.maydell@linaro.org Subject: [PATCH 5/6] configure: rename --enable-pypi to --enable-download, control subprojects too Date: Fri, 19 May 2023 10:56:45 +0200 Message-Id: <20230519085647.1104775-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230519085647.1104775-1-pbonzini@redhat.com> References: <20230519085647.1104775-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1684486677879100012 Content-Type: text/plain; charset="utf-8" The behavior of --{enable,disable}-pypi is similar to that of -Dwrapmode=3D{default,nodownload} respectively. In particular, in both cases a feature needs to be explicitly enabled for the dependency to be downloaded. So, use a single option to control both cases. Now, --enable-slirp will trigger cloning and building of libslirp if the .pc file is not found on the machine. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitignore | 2 -- configure | 17 +++++++---------- subprojects/.gitignore | 3 +++ 3 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 subprojects/.gitignore diff --git a/.gitignore b/.gitignore index 1ea59f481921..61fa39967b54 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,3 @@ GTAGS *.swp *.patch *.gcov - -/subprojects/slirp diff --git a/configure b/configure index 2b6995e16756..43620b80c8df 100755 --- a/configure +++ b/configure @@ -267,7 +267,7 @@ bsd_user=3D"" plugins=3D"$default_feature" ninja=3D"" python=3D -pypi=3D"enabled" +download=3D"enabled" bindir=3D"bin" skip_meson=3Dno vfio_user_server=3D"disabled" @@ -765,9 +765,9 @@ for opt do --with-git-submodules=3D*) git_submodules_action=3D"$optarg" ;; - --disable-pypi) pypi=3D"disabled" + --disable-download) download=3D"disabled" ;; - --enable-pypi) pypi=3D"enabled" + --enable-download) download=3D"enabled" ;; --enable-plugins) if test "$mingw32" =3D "yes"; then error_exit "TCG plugins not currently supported on= Windows platforms" @@ -978,7 +978,7 @@ python=3D"$(command -v "$python")" # - venv is allowed to use system packages; # - all setup can be performed offline; # - missing packages may be fetched from PyPI, -# unless --disable-pypi is passed. +# unless --disable-download is passed. # - pip is not installed into the venv when possible, # but ensurepip is called as a fallback when necessary. =20 @@ -995,7 +995,7 @@ python=3D"$python -B" mkvenv=3D"$python ${source_path}/python/scripts/mkvenv.py" =20 mkvenv_flags=3D"" -if test "$pypi" =3D "enabled" ; then +if test "$download" =3D "enabled" ; then mkvenv_flags=3D"--online" fi =20 @@ -1018,7 +1018,7 @@ meson=3D"$(cd pyvenv/bin; pwd)/meson" # Conditionally ensure Sphinx is installed. =20 mkvenv_flags=3D"" -if test "$pypi" =3D "enabled" -a "$docs" =3D "enabled" ; then +if test "$download" =3D "enabled" -a "$docs" =3D "enabled" ; then mkvenv_flags=3D"--online" fi =20 @@ -1960,11 +1960,8 @@ if test "$skip_meson" =3D no; then =20 rm -rf meson-private meson-info meson-logs =20 - # Prevent meson from automatically downloading wrapped subprojects when = missing. - # You can use 'meson subprojects download' before running configure. - meson_option_add "--wrap-mode=3Dnodownload" - # Built-in options + test "$download" =3D "disabled" && meson_option_add "--wrap-mode=3Dnodow= nload" test "$bindir" !=3D "bin" && meson_option_add "-Dbindir=3D$bindir" test "$default_feature" =3D no && meson_option_add -Dauto_features=3Ddis= abled test "$static" =3D yes && meson_option_add -Dprefer_static=3Dtrue diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 000000000000..7560ebb0b1a0 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1,3 @@ +/packagecache + +/slirp --=20 2.40.1