From nobody Mon Feb 9 19:37:35 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=1602535927; cv=none; d=zohomail.com; s=zohoarc; b=LY/16ovO6itB8pDYPWqgp5/PpPgYBPdBF5n13fgJ5DqCb5gOMQGE9KWuXh7tPQ1AoA6t5Cc9yYpe251XyEjktQoyPJdxStc8xAIaB+l5dil4+DiqCijD73w/Aj/XBpW1zyaHeHy53G2Dkg2kEF/UEDgRuNbjPA/Owtn+eF2s3Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602535927; h=Content-Type:Content-Transfer-Encoding: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=amCd8MPJ5JbVAyhyBDOKUGF3E7N6O6LgOOnFLyzDDJI=; b=RFJyQfveFGE+GuTwXVpicoh7d9C6zvCNEVPguWBAd3A3ZKMsAKTgcZEj88mTqliNC/uUW2hv6cOltFjASXdTQgXYI2BUEyxOV8ZBGNT0FaY5NuxlLcZgg0DSWWTkJkISfrdAh9ZVvssYzjmwEKlKZWE7thX36TzBtgwaytymgVg= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602535927625634.0677021547747; Mon, 12 Oct 2020 13:52:07 -0700 (PDT) Received: from localhost ([::1]:46754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kS4ne-0001UN-Bh for importer@patchew.org; Mon, 12 Oct 2020 16:52:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kS4WR-0002rc-E9 for qemu-devel@nongnu.org; Mon, 12 Oct 2020 16:34:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60146) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kS4WM-0002iq-5Z for qemu-devel@nongnu.org; Mon, 12 Oct 2020 16:34:19 -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-19-EFTn3PNuMdCVwHisPWh0uA-1; Mon, 12 Oct 2020 16:34:11 -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 2EFC5D68A3 for ; Mon, 12 Oct 2020 20:34:03 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6B796EF59 for ; Mon, 12 Oct 2020 20:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602534852; 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=amCd8MPJ5JbVAyhyBDOKUGF3E7N6O6LgOOnFLyzDDJI=; b=OKaIDeIlit3UbBzwSoTJrS5C6mgR8GOwsRmUCIU1RU3eZTDH6rH2spIGdXAdpTiaSMYy3p VjzVbtGufkY9l71LFbss/GfNGzj4OIAY72OD54r+YhhCEWyLlWR0qvXg/wiif2DJffUBpi JIbdqwe9Z92yjMds83AXMfL1sed2RLQ= X-MC-Unique: EFTn3PNuMdCVwHisPWh0uA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 38/38] meson: identify more sections of meson.build Date: Mon, 12 Oct 2020 16:33:43 -0400 Message-Id: <20201012203343.1105018-39-pbonzini@redhat.com> In-Reply-To: <20201012203343.1105018-1-pbonzini@redhat.com> References: <20201012203343.1105018-1-pbonzini@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=pbonzini@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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/11 23:52:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add more headers that clarify code organization. Signed-off-by: Paolo Bonzini --- meson.build | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 0c676af194..652c37cceb 100644 --- a/meson.build +++ b/meson.build @@ -614,7 +614,9 @@ if not has_malloc_trim and get_option('malloc_trim').en= abled() endif endif =20 -# Create config-host.h +################# +# config-host.h # +################# =20 config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_LIBUDEV', libudev.found()) @@ -660,6 +662,10 @@ foreach k, v: config_host endif endforeach =20 +######################## +# Target configuration # +######################## + minikconf =3D find_program('scripts/minikconf.py') config_all =3D {} config_all_devices =3D {} @@ -866,7 +872,9 @@ config_all +=3D { 'CONFIG_ALL': true, } =20 -# Submodules +############## +# Submodules # +############## =20 capstone =3D not_found capstone_opt =3D get_option('capstone') @@ -1105,9 +1113,11 @@ config_host_data.set('CONFIG_CAPSTONE', capstone.fou= nd()) config_host_data.set('CONFIG_FDT', fdt.found()) config_host_data.set('CONFIG_SLIRP', slirp.found()) =20 -genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) +##################### +# Generated sources # +##################### =20 -# Generators +genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) =20 hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.pl') @@ -1182,7 +1192,9 @@ sphinx_extn_depends =3D [ meson.source_root() / 'docs= /sphinx/depfile.py', meson.source_root() / 'docs/sphinx/qmp_lexer.py', qapi_gen_depends ] =20 -# Collect sourcesets. +################### +# Collect sources # +################### =20 authz_ss =3D ss.source_set() blockdev_ss =3D ss.source_set() @@ -1320,8 +1332,6 @@ if enable_modules modulecommon =3D declare_dependency(link_whole: libmodulecommon, compile= _args: '-DBUILD_DSO') endif =20 -# Build targets from sourcesets - stub_ss =3D stub_ss.apply(config_all, strict: false) =20 util_ss.add_all(trace_ss) @@ -1409,6 +1419,10 @@ specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_tr= ue: linux_user_ss) subdir('tests/qtest/libqos') subdir('tests/qtest/fuzz') =20 +######################## +# Library dependencies # +######################## + block_mods =3D [] softmmu_mods =3D [] foreach d, list : modules @@ -1443,10 +1457,6 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) =20 -######################## -# Library dependencies # -######################## - qom_ss =3D qom_ss.apply(config_host, strict: false) libqom =3D static_library('qom', qom_ss.sources() + genh, dependencies: [qom_ss.dependencies()], @@ -1797,6 +1807,10 @@ if host_machine.system() =3D=3D 'windows' alias_target('installer', nsis) endif =20 +######################### +# Configuration summary # +######################### + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} --=20 2.26.2