From nobody Wed Nov 27 00:34:08 2024 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=1703179387; cv=none; d=zohomail.com; s=zohoarc; b=A3sRyi7qImN0i1JC6Ttbffmk0u/Zk8GY5WVp7hvAKrRbfktRPGAfGiBRQtfUg2kwmouy+4fhso6c4Yn6z9c0ufzqcF7TLgge/B65qQssd5Nnu6FpykYjvE0XfwJlV4VB2no2Mg84yzyMdK1L35ju7WoVsDSw2pp2zIqj1Zwzad0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703179387; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=bXT4Dl0Kw/7UM64Z5onnUqN5IYVBTfeIAuQM9EaJTPg=; b=RUaBGlyPxQdYROeprFzgokQifSLDyDp+S89F5qdgdtneTB1o57ZCnsfLS5GSF4+lfomWU3qG+BTO62oYwh/rswo//LdZrPqfUQG4+vqllMelRwYvg6ZE4vRi3x9+gE3HDg9T5+7w1Yd/eJNShlK/L7LBlEqklaW1cx0Y2xPj8no= 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 1703179387718212.31263819830644; Thu, 21 Dec 2023 09:23:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMil-0007be-Do; Thu, 21 Dec 2023 12:20:31 -0500 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 1rGMik-0007bV-I9 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:30 -0500 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 1rGMii-0004XQ-W6 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:30 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-690-roYk5VeqNaal9V_83knv0Q-1; Thu, 21 Dec 2023 12:20:26 -0500 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40c348e529fso8939135e9.2 for ; Thu, 21 Dec 2023 09:20:26 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id u4-20020a05600c138400b0040c03c3289bsm4025229wmf.37.2023.12.21.09.20.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bXT4Dl0Kw/7UM64Z5onnUqN5IYVBTfeIAuQM9EaJTPg=; b=NxBCKLcWFS3twH9X9Qd2wkRkPBQg3WpteoKxBwGp+kZ9fQ5JnKdWxa3fEebYT/GajUc68h Oo8B54+Jnf2VyajdxTRC0J87QO0CTREIEMIJF9OArep2/rfefQ0QdCHx5Vm2d3OoOiZtN2 C9abYDC7PeQ/mlAEf8AjVLz0+PHlHc0= X-MC-Unique: roYk5VeqNaal9V_83knv0Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179224; x=1703784024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bXT4Dl0Kw/7UM64Z5onnUqN5IYVBTfeIAuQM9EaJTPg=; b=Rd/Zk1taE3AYHgpXyFME2o39nQg86DO2B3ma1MpA90nD+x0biMhi9+c7XUe6nc9S+k FwsuY7Ax+4ukMhFBYELB1m10ik2oqF8xGss0cVedP8ZR6a/tcsXz+Q5thkypvBs8x6/Q /mM6CX6WdvjjZai6zv8gqCmiz03btUrdlLftI8U8SQlHnnyRqhSixGVD6YgowLjoR9Ni RySjQheXD45BOHq9PHDHtAM5kEozQpt2dhJiuZ8788pdbD5UmVUpWka9Wv8iMee0X17w OkYunwc+mT+T+UVPuiBj2YjgIgN+2PkrRCpfAkz0NP0003bMRJzFljo+h4oelHmiiCBZ oFcw== X-Gm-Message-State: AOJu0YxRnhvrGyb1dGYg7LiRBevWyuydB7CdKW+VYL0ClYPMDIE4BhPB U1xmk/1sUufTFRsQIlr9yfMffWEY76H+oKfoh0+IuSIbinx4p9aWa9rX9qzgnqgzKiCg4Y58YZg 9+uj0CCKqkSncs7LVoQW2SmnAeBbNuBK/ZKUgaJhHSrYio8PNuUNnQuPgXszwzY5uyFWrP3fa6e k+rK8jQ80= X-Received: by 2002:a05:600c:40c:b0:40c:3417:233 with SMTP id q12-20020a05600c040c00b0040c34170233mr42208wmb.102.1703179224699; Thu, 21 Dec 2023 09:20:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyljcVcXNeb+ld2T9i+/82DeC4yFp094jkIGHpaIIQvrjpJlWGHKt41mH9p76sgh2v+2YUfQ== X-Received: by 2002:a05:600c:40c:b0:40c:3417:233 with SMTP id q12-20020a05600c040c00b0040c34170233mr42205wmb.102.1703179224331; Thu, 21 Dec 2023 09:20:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 13/21] meson: add more sections to main meson.build Date: Thu, 21 Dec 2023 18:19:50 +0100 Message-ID: <20231221171958.59350-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-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.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1703179388093100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index b5a85c4c255..b8c64c5ecf7 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,10 @@ add_test_setup('thorough', env: ['G_TEST_SLOW=3D1', 'SPEED= =3Dthorough']) =20 meson.add_postconf_script(find_program('scripts/symlink-install-tree.py')) =20 +#################### +# Global variables # +#################### + not_found =3D dependency('', required: false) keyval =3D import('keyval') ss =3D import('sourceset') @@ -86,8 +90,16 @@ enable_modules =3D get_option('modules') \ .allowed() have_block =3D have_system or have_tools =20 +############ +# Programs # +############ + python =3D import('python').find_installation() =20 +####################################### +# Variables for host and accelerators # +####################################### + if cpu not in supported_cpus host_arch =3D 'unknown' elif cpu =3D=3D 'x86' @@ -518,9 +530,9 @@ if sparse.found() '-Wno-non-pointer-null']) endif =20 -########################################### -# Target-specific checks and dependencies # -########################################### +##################### +# Option validation # +##################### =20 # Fuzzing if get_option('fuzzing') and get_option('fuzzing_engine') =3D=3D '' and \ @@ -3495,9 +3507,9 @@ specific_ss.add_all(when: 'CONFIG_TCG_BUILTIN', if_tr= ue: tcg_module_ss) target_modules +=3D { 'accel' : { 'qtest': qtest_module_ss, 'tcg': tcg_real_module_ss }} =20 -######################## -# Library dependencies # -######################## +############################################## +# Internal static_libraries and dependencies # +############################################## =20 modinfo_collect =3D find_program('scripts/modinfo-collect.py') modinfo_generate =3D find_program('scripts/modinfo-generate.py') --=20 2.43.0