From nobody Mon Feb 9 11:06:27 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=1630258429; cv=none; d=zohomail.com; s=zohoarc; b=CYg3e05bkA3MRc8F+H/Uy4hr6Dgcusk2J4l+FQTofHev120pVURVp1/x38ZAsQn/moc6RW51Fsd3RU/uIblHDW4DA7tpOrqJN2kvEBcdMIp09u+++3rBuT75Wk10TQonSiVz9I0tHzSCbUn5yvsCJClVJSrHT7qbp/ac/+hugiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630258429; 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=wHknF0D1Eg1pEEEHG32q0tMsvG25u8EebWnjBUY2BGE=; b=CsEz/f7tYie+1+n57a1R6no0sgR9DPi0K0dPOMBd3Y0z9GhRBA4LgjXSZ01px6VwLNCVc6x49bvE3cnEySTTzH22UHt/qkubq4oqHFGZnrZwSqfiYuoSB9OiaOPEi3UaEnkOjbaTxTvJl60KVj2uG9HRI4qvNDJe6o1uteyhwUs= 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 1630258429175530.9440408159356; Sun, 29 Aug 2021 10:33:49 -0700 (PDT) Received: from localhost ([::1]:51624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKOgl-00073V-MU for importer@patchew.org; Sun, 29 Aug 2021 13:33:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfY-0005hC-7D for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfV-0007dc-7E for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-2JDcK0a9Pf2xs07AwAc4fg-1; Sun, 29 Aug 2021 13:32:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76E951082924 for ; Sun, 29 Aug 2021 17:32:25 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA2560D31; Sun, 29 Aug 2021 17:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630258347; 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=wHknF0D1Eg1pEEEHG32q0tMsvG25u8EebWnjBUY2BGE=; b=ZfheKy5nbnXBuzSUK4TPl2TDYwjlNiWaLBioE4htk9TFvyc7Hq2Q4jRia2VCUY2SKBPMMA 5dQmJVNQPRlmURMvY992/MdChJCqEQDDpbFEFX5YVt5A96yuc6vfQOE0wn+rwaAGu59SQt 2CkEmLY+0ueKECAHru9THYlzrX/2iQc= X-MC-Unique: 2JDcK0a9Pf2xs07AwAc4fg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 1/3] configure: Add the possibility to read options from meson_options.txt Date: Sun, 29 Aug 2021 19:32:08 +0200 Message-Id: <20210829173210.39562-2-thuth@redhat.com> In-Reply-To: <20210829173210.39562-1-thuth@redhat.com> References: <20210829173210.39562-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630258430153100002 Content-Type: text/plain; charset="utf-8" To avoid double maintenance between the configure script and meson_options.txt, add some simple logic in the configure script to read the options from meson_options.txt. Signed-off-by: Thomas Huth --- configure | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9a79a004d7..b3e6d51916 100755 --- a/configure +++ b/configure @@ -836,6 +836,8 @@ fi =20 werror=3D"" =20 +meson_options=3D"" + for opt do optarg=3D$(expr "x$opt" : 'x[^=3D]*=3D\(.*\)') case "$opt" in @@ -1581,6 +1583,26 @@ for opt do ;; --disable-slirp-smbd) slirp_smbd=3Dno ;; + --enable-*) + arg=3D$(echo "$opt" | sed -e "s/--enable-//" -e "s/-/_/g") + if ! grep -q "option('$arg', type[ ]*: 'feature'" \ + $source_path/meson_options.txt; then + echo "ERROR: unknown option $opt" + echo "Try '$0 --help' for more information" + exit 1 + fi + meson_options=3D"$meson_options -D$arg=3Denabled" + ;; + --disable-*) + arg=3D$(echo "$opt" | sed -e "s/--disable-//" -e "s/-/_/g") + if ! grep -q "option('$arg', type[ ]*: 'feature'" \ + $source_path/meson_options.txt; then + echo "ERROR: unknown option $opt" + echo "Try '$0 --help' for more information" + exit 1 + fi + meson_options=3D"$meson_options -D$arg=3Ddisabled" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -5211,7 +5233,7 @@ if test "$skip_meson" =3D no; then -Dvhost_user_blk_server=3D$vhost_user_blk_server -Dmultiprocess=3D= $multiprocess \ -Dfuse=3D$fuse -Dfuse_lseek=3D$fuse_lseek -Dguest_agent_msi=3D$gue= st_agent_msi -Dbpf=3D$bpf\ $(if test "$default_feature" =3D no; then echo "-Dauto_features=3D= disabled"; fi) \ - -Dtcg_interpreter=3D$tcg_interpreter \ + -Dtcg_interpreter=3D$tcg_interpreter $meson_options \ $cross_arg \ "$PWD" "$source_path" =20 --=20 2.27.0