From nobody Tue Jul 15 06:05:15 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650719681758700.2661680589802; Sat, 23 Apr 2022 06:14:41 -0700 (PDT) Received: from localhost ([::1]:33868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niFay-0005by-MC for importer2@patchew.org; Sat, 23 Apr 2022 09:14:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niFFs-0007Tq-VQ for qemu-devel@nongnu.org; Sat, 23 Apr 2022 08:52:53 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:35456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niFFr-0005Cy-4q for qemu-devel@nongnu.org; Sat, 23 Apr 2022 08:52:52 -0400 Received: by mail-ej1-x62c.google.com with SMTP id l7so21214118ejn.2 for ; Sat, 23 Apr 2022 05:52:50 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bo14-20020a170906d04e00b006ce98d9c3e3sm1655573ejb.194.2022.04.23.05.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 05:52:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BQ2Lcj+YdqXRcpRrMmrKaUG1RtsECttdprGaQ+wveUk=; b=DKdskAqaTM7zBiaLnKG81oWsAOpb06YBU0LHMCn433MyhylKTsytjaPvELW+D1kF/1 mqANjaaMU2EPVtB1D3F60b/3BxAyN0MGQAHqtZiLJE/5eOQ/1IxTJ0cpw9fJVZRFY/id /GZY6Ab/bz5fQt5Lx3A5oi3dTfwTLpmbza/StU+MqCQuD5/mj3nrfQZAyPjeBcbx/iJL f368aX8VedW5MlZr8Dw5Qyt3shQSxdYrC5gpu6hbitKy3NtCilzMbbTK2uu8+sv63hB8 m0itMgOhJuzchrxy5+WO2WbgtXgt85lnDr02hbABDmEfc0ve977gXEeNmQrN32HTkrh5 r7aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BQ2Lcj+YdqXRcpRrMmrKaUG1RtsECttdprGaQ+wveUk=; b=IbTnTap++ELEuLr3/UwP+IR/Bq2Bv2iT2P4qZW8JTNDtgqcL9Fg5T4oF56ElMVC6mL fyR7yfD57YIeoX1xT9wlCFJUA7HXEWWsMHLKf7EjyqVv2XLia4nggJCN1zHowLC8ZC4F NPfbXtKdF6+1XRflUXM6SWtI2VmxzMBGwX6pOcpkK33Vez9TMWprwGwqvbVijY2B4g0H Ek1GLv176sIlbqOavwVTjoFJ63phuzPKwBVpylGNOIlNsag4qhUsywYVq/uDeR5GuFpc 53GWe36yM08K7tN+yso6qFxJC8zdRfm+hrm8IKME5iacUwUgZ7r2WAHMlYMmdmrs6OXe py4A== X-Gm-Message-State: AOAM531LlmVlQrLAApI4Kq0cNv19+oUDBdIudl7EZA8yYg4LuRr6bEi6 q5WpZPxc9lGLgLo34cShZQ2hUmSsXexQGQ== X-Google-Smtp-Source: ABdhPJzm9wVsddM8CBzcy93SqZ+DSUevG7sqtS40Nn34jtd3nveXpDwuYpl7jDggNT9ExvOy9HnZ0g== X-Received: by 2002:a17:906:9c84:b0:6e0:7c75:6f01 with SMTP id fj4-20020a1709069c8400b006e07c756f01mr8194406ejc.103.1650718369931; Sat, 23 Apr 2022 05:52:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 26/34] configure: omit options with default values from meson command line Date: Sat, 23 Apr 2022 14:51:43 +0200 Message-Id: <20220423125151.27821-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220423125151.27821-1-pbonzini@redhat.com> References: <20220423125151.27821-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650719683647100001 This has no functional change, it only makes the command line shorter and nicer. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 29 +++++++++++++++++------------ meson.build | 2 +- meson_options.txt | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/configure b/configure index c6edbceff0..19947d8d6c 100755 --- a/configure +++ b/configure @@ -2348,19 +2348,24 @@ if test "$skip_meson" =3D no; then mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs + + # Built-in options + test "$bindir" !=3D "bin" && meson_option_add "-Dbindir=3D$bindir" + test "$default_feature" =3D no && meson_option_add -Dauto_features=3Ddis= abled + test "$pie" =3D no && meson_option_add -Db_pie=3Dfalse + test "$werror" =3D yes && meson_option_add -Dwerror=3Dtrue + + # QEMU options + test "$capstone" !=3D auto && meson_option_add "-Dcapstone=3D$capstone" + test "$cfi" !=3D false && meson_option_add "-Dcfi=3D$cfi" + test "$fdt" !=3D auto && meson_option_add "-Dfdt=3D$fdt" + test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engin= e=3D$LIB_FUZZING_ENGINE" + test "$qemu_suffix" !=3D qemu && meson_option_add "-Dqemu_suffix=3D$qemu= _suffix" + test "$slirp" !=3D auto && meson_option_add "-Dslirp=3D$slirp" + test "$smbd" !=3D '' && meson_option_add "-Dsmbd=3D$smbd" + test "$tcg" !=3D enabled && meson_option_add "-Dtcg=3D$tcg" run_meson() { - NINJA=3D$ninja $meson setup \ - --prefix "$prefix" \ - --bindir "$bindir" \ - -Dqemu_suffix=3D"$qemu_suffix" \ - -Dsmbd=3D"$smbd" \ - -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ - -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ - -Dcfi=3D$cfi -Dtcg=3D$tcg \ - -Dcapstone=3D$capstone -Dfdt=3D$fdt -Dslirp=3D$slirp \ - $(test -n "${LIB_FUZZING_ENGINE+xxx}" && echo "-Dfuzzing_engine=3D= $LIB_FUZZING_ENGINE") \ - $(if test "$default_feature" =3D no; then echo "-Dauto_features=3D= disabled"; fi) \ - "$@" $cross_arg "$PWD" "$source_path" + NINJA=3D$ninja $meson setup --prefix "$prefix" "$@" $cross_arg "$PWD" = "$source_path" } eval run_meson $meson_options if test "$?" -ne 0 ; then diff --git a/meson.build b/meson.build index 1fa4cc255e..6913ab0251 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('qemu', ['c'], meson_version: '>=3D0.59.3', default_options: ['warning_level=3D1', 'c_std=3Dgnu11', 'cpp_std= =3Dgnu++11', 'b_colorout=3Dauto', - 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse', 'opti= mization=3D2'], + 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse', 'opti= mization=3D2', 'b_pie=3Dtrue'], version: files('VERSION')) =20 add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: = true) diff --git a/meson_options.txt b/meson_options.txt index a76fadbd7d..8efd5f520c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -78,7 +78,7 @@ option('xen', type: 'feature', value: 'auto', description: 'Xen backend support') option('xen_pci_passthrough', type: 'feature', value: 'auto', description: 'Xen PCI passthrough support') -option('tcg', type: 'feature', value: 'auto', +option('tcg', type: 'feature', value: 'enabled', description: 'TCG support') option('tcg_interpreter', type: 'boolean', value: false, description: 'TCG with bytecode interpreter (slow)') --=20 2.35.1