From patchwork Tue Oct 6 12:55:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271962 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFC86C4363D for ; Tue, 6 Oct 2020 12:57:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 55BA02075A for ; Tue, 6 Oct 2020 12:57:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Qqy2iBle" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 55BA02075A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmXS-0004Q2-80 for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 08:57:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmVt-0002hz-P2 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37043) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmVq-0001sX-0c for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988973; 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=3byOrKG4yoU+gNrvvNZ8ALCAT6xbaRmzFtpysRfVokw=; b=Qqy2iBleHSYN+EXSaCxOoqxk9N8BClfL730qhn3OT11ryIT+6ORW5H44x4PCFIAcbx1OzJ DXajy4oO2aC+mP0H34fcU/IFbxBOZv7FiOI+JgT27pbXMSwKPkYpGEEbFX1A91QEQvv2Y7 +kPB2So1rMdbI/pe4l0LA6uy3fP1sqM= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-531-AavFQc4EO8CVTRdiAsJK-A-1; Tue, 06 Oct 2020 08:56:11 -0400 X-MC-Unique: AavFQc4EO8CVTRdiAsJK-A-1 Received: by mail-wr1-f72.google.com with SMTP id g7so513118wrm.2 for ; Tue, 06 Oct 2020 05:56:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3byOrKG4yoU+gNrvvNZ8ALCAT6xbaRmzFtpysRfVokw=; b=YgNghLSLFv/7XvxY9X+12aTsqHhkAiJhQ+VnUsmZmtd5mlKjWK/CsY1XHfTSEpwq+F ukPK+loKnvyIBEjgbgf79Yeo1Lz2LOwPPsTQa7/3+JQJ0RlOrwv+lc4mTYgsL8hnb8Pp 8Q0QTIU/TeffEkPJnp5Tq+CAe5K0ngEs9wRVCx08XXrX/KHcz6BxHRPS3XEDI6I9WAUb dFbP5KvBChh+ozWBABSelvtLGF3k9sYkvhAkZEbMfZHLrvLY4xroBsbOVWw+gIGfA6FW fA/DrWZeJsdm5jk3ZurOL8gSvgCDDeSkYgJ2XXPsGoOIUUegOaUo3yRuMpAHPppeCbgz 3QIA== X-Gm-Message-State: AOAM532yGHH5UIWC3O/65+kZp69PMZseNQ5Cb/BILsmIpEhNmFXTbN56 J++iZrrXh3LdZrpHnmEptbw170GiUzi+oaQ1mE8Vmhjzop4NoJaCQL0NC1PKAXC0qcnKqc7AgeF Qm8R6bSfopCSSV0g= X-Received: by 2002:adf:dbc3:: with SMTP id e3mr4829674wrj.1.1601988970228; Tue, 06 Oct 2020 05:56:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzLcZlkn6uo2uvxGkfw+8T1ws23uwy2hfnjafpWPvBbmUmIrAN35ZWunoNhYKLY2v1AsoGZg== X-Received: by 2002:adf:dbc3:: with SMTP id e3mr4829643wrj.1.1601988969996; Tue, 06 Oct 2020 05:56:09 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id v2sm4202033wme.19.2020.10.06.05.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/9] meson.build: Add comments to clarify code organization Date: Tue, 6 Oct 2020 14:55:54 +0200 Message-Id: <20201006125602.2311423-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meson.build b/meson.build index a02c743794..4101620777 100644 --- a/meson.build +++ b/meson.build @@ -1323,6 +1323,10 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) +######################## +# Library dependencies # +######################## + block_ss = block_ss.apply(config_host, strict: false) libblock = static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), @@ -1342,6 +1346,10 @@ libqmp = static_library('qmp', qmp_ss.sources() + genh, qmp = declare_dependency(link_whole: [libqmp]) +########### +# Targets # +########### + foreach m : block_mods + softmmu_mods shared_module(m.name(), name_prefix: '', From patchwork Tue Oct 6 12:55:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C86BC41604 for ; Tue, 6 Oct 2020 13:07:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E250E20760 for ; Tue, 6 Oct 2020 13:07:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="T+Qub80d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E250E20760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmh7-0006gb-Si for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 09:07:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmVy-0002rl-7r for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55445) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmVw-0001t0-Cf for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988979; 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=VHqbyXPiJRDV4C8FnQjUpTXWXPI5vIxp7C25lKKq3Fo=; b=T+Qub80d9oSouka5gX6nk9r2rgzTBPDfgKb5ouOXbidd9aYWJMeo+kBoencC5KwJi3nAjJ gchZSkfJHmrm70Tb9PpubDP4rpo2vwHXZlfWLx9vzHMnieZS6w0MGQEXkzD8lwtyUtzyDh EPR26L66TYdWzyI2CAoXblMjxd2jiZg= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-0b98J307OFint8Mr_-sreQ-1; Tue, 06 Oct 2020 08:56:16 -0400 X-MC-Unique: 0b98J307OFint8Mr_-sreQ-1 Received: by mail-wr1-f71.google.com with SMTP id y3so5312094wrl.21 for ; Tue, 06 Oct 2020 05:56:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VHqbyXPiJRDV4C8FnQjUpTXWXPI5vIxp7C25lKKq3Fo=; b=HCBHBmqDVysfAel1KNsLi5pZLq7JTNdsOtPViLPMMjRmF7HeNoyBJkRoB/CyVFn+qd BEhUJeak/qDLYH5kLtWiF1zMaefBGQSKQ4CWRE3A6uOMgXegp82En7OcbIqUty/TAoNZ JdrGDXEXN4n7422w+Rqj8KksjNZJ4//9y00YpgB/efGzj8M9eRHbLI1CgF6tLQrMIFIz M6TTpS+mha+sMdLS8MdNaZMEu1BrqJoeQrenmF2xh5PxiC5Q5mC9JiLZf1JszfYMdFHw qeo5U0DigM6yiA8frsxRT3VyTtuxIw0xOiZmKJGAwx1vpSr2yDfip5sk4PBab5/Lktkw 575A== X-Gm-Message-State: AOAM530UWLbSaz+iRu1M2RQmSSm6TepwEMLB19MaCiTVwcPn/93E/Pma E1RWR2N8kJaNtAibFXhISlTwRajyfcAnTEaJCjS4S5CA8iSn73QCZL/OujU/yq9xfbsE+z7HECy cqG3EvpxCF8kZ/ss= X-Received: by 2002:a5d:6a85:: with SMTP id s5mr2832708wru.90.1601988975096; Tue, 06 Oct 2020 05:56:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeqrQWQCRK1EX2S+oD40CiZSTZfJhoZAZ8DHL2+3uZ/MK8Gtyhjz0sp06K+9lSMCE2NytQGg== X-Received: by 2002:a5d:6a85:: with SMTP id s5mr2832685wru.90.1601988974951; Tue, 06 Oct 2020 05:56:14 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id f14sm4761594wrv.72.2020.10.06.05.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/9] meson.build: Sort sourcesets alphabetically Date: Tue, 6 Oct 2020 14:55:55 +0200 Message-Id: <20201006125602.2311423-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 4101620777..60497f5615 100644 --- a/meson.build +++ b/meson.build @@ -1059,19 +1059,19 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', # Collect sourcesets. -util_ss = ss.source_set() +blockdev_ss = ss.source_set() +block_ss = ss.source_set() +bsd_user_ss = ss.source_set() +common_ss = ss.source_set() +linux_user_ss = ss.source_set() +qmp_ss = ss.source_set() +softmmu_ss = ss.source_set() +specific_fuzz_ss = ss.source_set() +specific_ss = ss.source_set() stub_ss = ss.source_set() trace_ss = ss.source_set() -block_ss = ss.source_set() -blockdev_ss = ss.source_set() -qmp_ss = ss.source_set() -common_ss = ss.source_set() -softmmu_ss = ss.source_set() user_ss = ss.source_set() -bsd_user_ss = ss.source_set() -linux_user_ss = ss.source_set() -specific_ss = ss.source_set() -specific_fuzz_ss = ss.source_set() +util_ss = ss.source_set() modules = {} hw_arch = {} From patchwork Tue Oct 6 12:55:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AE0EC4363D for ; Tue, 6 Oct 2020 13:11:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B524920760 for ; Tue, 6 Oct 2020 13:11:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="J0dOZer1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B524920760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmkR-0001qq-H9 for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 09:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmW3-00033H-09 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmW1-0001tS-3z for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988984; 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=iu4VFbji1NYalAxtgTpGrAQFcSu9AmIxH2mbp91RPjA=; b=J0dOZer1FfVU0kC16LT2sptU2GeHr+1z2otsTJXMCqZvvlbT5fjGw7siPBL82cVcAbmBdu N+rMUSpvqtoyMD4NkbznOgoKupMcr5465a44zPf8NAaDzoIux3pJEcUe3qshEGsAqN9x/V v4W9KD374OvqY5k/AiEy/2iVKts3z40= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306-gcrpu401PBqahDuh3j51fg-1; Tue, 06 Oct 2020 08:56:21 -0400 X-MC-Unique: gcrpu401PBqahDuh3j51fg-1 Received: by mail-wr1-f70.google.com with SMTP id 33so2988314wrf.22 for ; Tue, 06 Oct 2020 05:56:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iu4VFbji1NYalAxtgTpGrAQFcSu9AmIxH2mbp91RPjA=; b=d2kjqVkKXx6iuUTTBKd6/dy6yAvq3Vya4iIo7v+1X300sTVxXUyqMLr+J2ZqN3hG9r h37eA3MtZmfi1D15yfw9N/D9UZgDvKzSECVLQzy/aCwB86nMR7H72CARSab9fHl+44MW MHc4w4HBjNcp0UVW4kcm6diQsYEb3uB3egpVr6g7l6JLMDljIvxbFSLFvgiOTequywaK vPtXzTsbtWFX6xWEchK5l5UWB8XH6TTUwXvqedfrwukeTpmz/XC3Nr+rjVT0/lzXNeYJ PpUa/T63/PFd1kbe9eWySEE6CqjWuclAPjVy3TvWXnTGO1jvAEzpaBIGdqzk0KngjcGG DnYQ== X-Gm-Message-State: AOAM530yzhQI/hn0Qq1T7Dna1GpPbO2KHg9puwdt4BWVXY0iCkcqssOm d+439mN3qnEgZihvBMeCmkv8N5ChjFxmF7v76xORVjulBfUTAKUnp5AyjvVBJVhIGZXAqS0vZhL hcLcMOrULkAHQKWo= X-Received: by 2002:adf:f584:: with SMTP id f4mr4590311wro.383.1601988980104; Tue, 06 Oct 2020 05:56:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+WUzcbY4Qb1+NBLQViKKYuMdVWkEAjiUpRbAfy8WJwU2jgXQJd/r6+HrmRrPY5XIl/x7DLg== X-Received: by 2002:adf:f584:: with SMTP id f4mr4590284wro.383.1601988979900; Tue, 06 Oct 2020 05:56:19 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id b8sm3850769wmb.4.2020.10.06.05.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/9] hw/core: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:56 +0200 Message-Id: <20201006125602.2311423-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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_H5=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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 6 ++++++ hw/core/meson.build | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 60497f5615..47eb7d3709 100644 --- a/meson.build +++ b/meson.build @@ -1346,6 +1346,12 @@ libqmp = static_library('qmp', qmp_ss.sources() + genh, qmp = declare_dependency(link_whole: [libqmp]) +libhwcore = static_library('hwcore', sources: hwcore_files + genh, + name_suffix: 'fa', + build_by_default: false) +hwcore = declare_dependency(link_whole: libhwcore) +common_ss.add(hwcore) + ########### # Targets # ########### diff --git a/hw/core/meson.build b/hw/core/meson.build index fc91f98075..4a744f3b5e 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -14,12 +14,6 @@ hwcore_files = files( 'qdev-clock.c', ) -libhwcore = static_library('hwcore', sources: hwcore_files + genh, - name_suffix: 'fa', - build_by_default: false) -hwcore = declare_dependency(link_whole: libhwcore) -common_ss.add(hwcore) - common_ss.add(files('cpu.c')) common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) From patchwork Tue Oct 6 12:55:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303598 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 849C9C4363D for ; Tue, 6 Oct 2020 13:04:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E513C2075A for ; Tue, 6 Oct 2020 13:04:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DBg6Quaf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E513C2075A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmdL-0002ri-NU for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 09:03:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmW8-00039u-1F for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmW5-0001tv-20 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988988; 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=8XFQO4+C4ntP2b83qPWVKeB3auO8XBYBXJzdLRqnK/M=; b=DBg6QuafqjDcMyIBmd3DGZnJLel1expxVczPG0J6o45A7LW5nMuQKlU6c4Rxp6B1K6Y+3v G9Wd6YX6IQiXho9NK5znazx1IdDb8Ix5xlh/jtP1jWYNpVBBu+oogeb30Fv6yt9RoYVL/S stNesbJsGje6WYV2p9akijDiQ/VKkRI= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-555-R83JbxZcNqCqHZQM1mFPqg-1; Tue, 06 Oct 2020 08:56:26 -0400 X-MC-Unique: R83JbxZcNqCqHZQM1mFPqg-1 Received: by mail-wm1-f72.google.com with SMTP id u5so664935wme.3 for ; Tue, 06 Oct 2020 05:56:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8XFQO4+C4ntP2b83qPWVKeB3auO8XBYBXJzdLRqnK/M=; b=Gtu6F5RFvizHBmM6wuOlsr6i+T3iMbDRWBMihxGDICQKYAXZfb/+69av9BMAqDZOAD GAF40U80qkR1Ndoy9SzWASBx4951HB9/gMf19zuJX3M65JeVJ37EDgYfVIwz1kYJ9U7J oLQNdUIi3yos43azRfGhirgAKCuoZRxEwrMGKaj1SFKOVI0koNk7i7GcGNVPxLi9wgoD Rmm+VTSNI06F1s7BwfMVNwLOClJe0mV2MWPVph2XfKozutAhhRSOHpsQUFr0Aq5KkTI0 oq0S9AE2QFVD90jYok7Im8A0mtrx6/oVfJC+v9BXpdeuQ2GrsFDjOHwstyWrYaWtImum 2ywQ== X-Gm-Message-State: AOAM530Nlae4GWn1sCbr4Q8GQ5RNXqNUwz1azeb82OHI/pIfuOgKIXx4 6qM8CtacIsu43Phf9wlPNsFY8rimpyN8Qp7LFMOXuRfBu8AC2h0GIn2tIrHdff5kKQnxs5spEqY degL6l5ta96dxWcI= X-Received: by 2002:a5d:6311:: with SMTP id i17mr4576649wru.243.1601988985347; Tue, 06 Oct 2020 05:56:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp9TFYXdx8eKlKnz69xteHGW/NyBhHnCt25BlfDngVePi8xiWeZZb2/mGFxP6YCeosXeHWCw== X-Received: by 2002:a5d:6311:: with SMTP id i17mr4576632wru.243.1601988985189; Tue, 06 Oct 2020 05:56:25 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id c4sm3950738wme.27.2020.10.06.05.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/9] chardev: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:57 +0200 Message-Id: <20201006125602.2311423-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 7 +++++++ chardev/meson.build | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 47eb7d3709..3c0d7b4d44 100644 --- a/meson.build +++ b/meson.build @@ -1062,6 +1062,7 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', blockdev_ss = ss.source_set() block_ss = ss.source_set() bsd_user_ss = ss.source_set() +chardev_ss = ss.source_set() common_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() @@ -1346,6 +1347,12 @@ libqmp = static_library('qmp', qmp_ss.sources() + genh, qmp = declare_dependency(link_whole: [libqmp]) +libchardev = static_library('chardev', chardev_ss.sources() + genh, + name_suffix: 'fa', + build_by_default: false) + +chardev = declare_dependency(link_whole: libchardev) + libhwcore = static_library('hwcore', sources: hwcore_files + genh, name_suffix: 'fa', build_by_default: false) diff --git a/chardev/meson.build b/chardev/meson.build index 54e88d0310..dd2699a11b 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -1,4 +1,3 @@ -chardev_ss = ss.source_set() chardev_ss.add(files( 'char-fe.c', 'char-file.c', @@ -25,11 +24,6 @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( )) chardev_ss = chardev_ss.apply(config_host, strict: false) -libchardev = static_library('chardev', chardev_ss.sources() + genh, - name_suffix: 'fa', - build_by_default: false) - -chardev = declare_dependency(link_whole: libchardev) softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testdev.c')) softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) From patchwork Tue Oct 6 12:55:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EA6FC4363D for ; Tue, 6 Oct 2020 13:07:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B442320760 for ; Tue, 6 Oct 2020 13:07:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OLW/e10+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B442320760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmh1-0006Sr-Fn for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 09:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmWE-0003JC-7n for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmWC-0001uf-2c for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988994; 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=+civm+lmzYKDJ7YA3YOOXf6dQ0UsRfqcLEm+1Urmtw8=; b=OLW/e10+fSJ/45baSf2sFapzm+2/oVzBhJKpblczy1NBm0f8d9oh1KRiDKpKxQiS2Vkt1k m9zomJXj+mrcky2UI8CEw8MGPTvcX9ME9yPVf8VX/7gkVpbBZ/FsFgf2iOKf0cFAZ54pNc 2rkafATuT16gjSqFgmc5MU+VudlqwH4= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-dftFtcGbMzWDQzC_sCY6QQ-1; Tue, 06 Oct 2020 08:56:32 -0400 X-MC-Unique: dftFtcGbMzWDQzC_sCY6QQ-1 Received: by mail-wr1-f72.google.com with SMTP id i10so5301869wrq.5 for ; Tue, 06 Oct 2020 05:56:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+civm+lmzYKDJ7YA3YOOXf6dQ0UsRfqcLEm+1Urmtw8=; b=nZJgdZArbFabqeXrXHCkT1FMwz9E+3Uw8L4dv1NF1WyVvTBveeXgC/mvqh9ZB6B2BO +iMl2ZkQ4LV9WqnrIOT5EHYejrA4WbHVEP733WiMCTmIwJV6H9+8M8NYgeyNsemlnndv 0zYRTYK+seG+s2dV8WOrtrA2pHZhgl3y/0z26Tt1ayFYjoVrYTjNj9nDYWySvaMR9TK9 OlBUNAYcurXxX3F9SG8LX24K+LsOpY6yBQasqYOCYnjnDogHk2Z+xylPdfrMdPziK2SU NWoQVwQ+EZ59YZa7DxV2x7Fk7yF5b1eDE2tjv+XNcSsFO9mYs7cAhHQWMjybkXZi/Je8 V9Mw== X-Gm-Message-State: AOAM532NKyeDIFR3rVFLydejsMl4+hdmWZzqAlBYlnC39kUc11XC+fF0 7N6O28Fa7XWl6deX4+z5c1279IqV0xqCGmzN18yEnmpuOQOr8wJqOZRSwsrHE12qHvktTf8Glbz vzTT8Sks9ELpbOtI= X-Received: by 2002:a05:600c:c5:: with SMTP id u5mr4621346wmm.14.1601988990456; Tue, 06 Oct 2020 05:56:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBBR0nks+OH7sHMF017w1FYq4pUfMy/bUhEy3McUfY03FAVeOwyySBY/4nz4VfzW+Btxe7zA== X-Received: by 2002:a05:600c:c5:: with SMTP id u5mr4621334wmm.14.1601988990293; Tue, 06 Oct 2020 05:56:30 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id b11sm4322492wrt.38.2020.10.06.05.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 5/9] migration: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:58 +0200 Message-Id: <20201006125602.2311423-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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_H5=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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 7 +++++++ migration/meson.build | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 3c0d7b4d44..0e3598e267 100644 --- a/meson.build +++ b/meson.build @@ -1328,6 +1328,13 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +libmigration = static_library('migration', sources: migration_files + genh, + name_suffix: 'fa', + build_by_default: false) +migration = declare_dependency(link_with: libmigration, + dependencies: [zlib, qom, io]) +softmmu_ss.add(migration) + block_ss = block_ss.apply(config_host, strict: false) libblock = static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), diff --git a/migration/meson.build b/migration/meson.build index b5b71c8060..980e37865c 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -8,13 +8,7 @@ migration_files = files( 'qemu-file.c', 'qjson.c', ) - -libmigration = static_library('migration', sources: migration_files + genh, - name_suffix: 'fa', - build_by_default: false) -migration = declare_dependency(link_with: libmigration, - dependencies: [zlib, qom, io]) -softmmu_ss.add(migration) +softmmu_ss.add(migration_files) softmmu_ss.add(files( 'block-dirty-bitmap.c', From patchwork Tue Oct 6 12:55:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303599 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4C60C4363D for ; Tue, 6 Oct 2020 12:59:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45E892075A for ; Tue, 6 Oct 2020 12:59:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZBSXJqT5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45E892075A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmZ8-0007N2-9I for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 08:59:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmWJ-0003Pd-RG for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmWH-0001wI-4r for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989000; 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=uo2CBkWFfKQfoIhaUjbFZ5zVf7ry84pgNlp78mZ6R2E=; b=ZBSXJqT5AkOyw73yUEbR2WlEzmd3KHsPKa3/N31D+RDb23lAyo3AQV8kFJREv8C9cvS1yg eeayePbSUdYrNAgPtmLzeU9HTD0CGovaIBKlptyTJfyjYfnIIPO+UclG/ExfRuuZyd6RlC cdwUtnmlpWoYIsf9e8DbqACpms9ptLs= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-7-CHlrOM_9Nb6RfLDvCmUo5A-1; Tue, 06 Oct 2020 08:56:37 -0400 X-MC-Unique: CHlrOM_9Nb6RfLDvCmUo5A-1 Received: by mail-wm1-f72.google.com with SMTP id p17so660475wmi.7 for ; Tue, 06 Oct 2020 05:56:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uo2CBkWFfKQfoIhaUjbFZ5zVf7ry84pgNlp78mZ6R2E=; b=FFfMQmKjwd7FnXUA7+KFvZxRGtDkMEwCK92uJQciFXEVdP5qch0G1sMjYE45WcHA2F shfyIPkWsphuA+Y4faiiSNqhtYfe5RNJN4j1EdRB8YmC2BEIanMdNHF3UIId01nOygUB OjxkLT8z4IV8zUtqQBmeCFaMPibUL209J2WgOaBo3xpQPoDtEOQPRUwiJ40u5Bl1dbtk jXCDFssLj+7nQ7Ssw37JLq02MFWZ2DrNyjLDDBspRFLBB0ktoF+nNVv3BfsP8pmp10xV dEbSj2hWmWzkCXR/kOE7lHChvNsu/cpQ5wlFrcWJd+tGy2wB66kAbjiBXou400ySboEp Bm8Q== X-Gm-Message-State: AOAM5302LaoKHn5DTM7xNcWNroRjsWfogtygnaXrjcpVNPPlT6g5AWps daBo5CoW0gY/sw/7WyhMvy6qTPQQ7e0GTWEgOgMnycqhiGc65HDjIozctAJkDVKdlZdfGVmJdk4 xg1FioV9cHyuhjUM= X-Received: by 2002:a1c:2cc4:: with SMTP id s187mr4657241wms.36.1601988995380; Tue, 06 Oct 2020 05:56:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt/Va/EZ57ZPFYV0CpGFlbTfh0g7Kaso5whh9xynKcqrV4rSeY5XklV10J1UM97NWLqQvOLw== X-Received: by 2002:a1c:2cc4:: with SMTP id s187mr4657223wms.36.1601988995221; Tue, 06 Oct 2020 05:56:35 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id h17sm4772675wro.27.2020.10.06.05.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/9] io: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:59 +0200 Message-Id: <20201006125602.2311423-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 10 ++++++++++ io/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 0e3598e267..f9d952d685 100644 --- a/meson.build +++ b/meson.build @@ -1064,6 +1064,7 @@ block_ss = ss.source_set() bsd_user_ss = ss.source_set() chardev_ss = ss.source_set() common_ss = ss.source_set() +io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() softmmu_ss = ss.source_set() @@ -1328,6 +1329,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +io_ss = io_ss.apply(config_host, strict: false) +libio = static_library('io', io_ss.sources() + genh, + dependencies: [io_ss.dependencies()], + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +io = declare_dependency(link_whole: libio, dependencies: [crypto, qom]) + libmigration = static_library('migration', sources: migration_files + genh, name_suffix: 'fa', build_by_default: false) diff --git a/io/meson.build b/io/meson.build index 768c1b5ec3..bcd8b1e737 100644 --- a/io/meson.build +++ b/io/meson.build @@ -1,4 +1,3 @@ -io_ss = ss.source_set() io_ss.add(genh) io_ss.add(files( 'channel-buffer.c', @@ -14,12 +13,3 @@ io_ss.add(files( 'net-listener.c', 'task.c', )) - -io_ss = io_ss.apply(config_host, strict: false) -libio = static_library('io', io_ss.sources() + genh, - dependencies: [io_ss.dependencies()], - link_with: libqemuutil, - name_suffix: 'fa', - build_by_default: false) - -io = declare_dependency(link_whole: libio, dependencies: [crypto, qom]) From patchwork Tue Oct 6 12:56:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71B3AC4363D for ; Tue, 6 Oct 2020 13:05:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BED512075A for ; Tue, 6 Oct 2020 13:05:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OTBr3zsp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BED512075A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmeV-0003gv-GQ for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 09:05:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmWP-0003XR-42 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmWN-0001xA-7k for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989005; 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=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=OTBr3zspPr1yvktHQQDLLu6tYFZ/gEhfmfYHNwGP0RlBkFbf2Jc01ocQk4Nx7y3qvOCl1E 4C5RNY6dNJjD+1rLzg6zHVqNHad9qS+jqRIFWANrw4NOy9sozCrLoFIXBQ0lNlTgZcL2Dp 7OkGgx76KrZy/0FzirPtjcRD5gXUpCg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-440-Lm04hEscPwiuDun1Uq2lAg-1; Tue, 06 Oct 2020 08:56:43 -0400 X-MC-Unique: Lm04hEscPwiuDun1Uq2lAg-1 Received: by mail-wr1-f72.google.com with SMTP id d13so5289545wrr.23 for ; Tue, 06 Oct 2020 05:56:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=gT70Xi2nTpyklOawC63gvis9YxNA1/3lH8F4rjEuPp03cFJOB4nUfe36vQ6jFN6G6X HneX3yuq6aenN60J2aw1qA9bGXCEr5Qrm8WZWONjxnTRpZKyMxj4HE7/dcclv6WffUqC 6iERh0zqpw6uHDY9RZ8UJnrpcuRsBQi3C+QDcZszBiJgWyrAN02FEjy2Ny7ASZyPcvdl UuWZY7abO2VrybvQo9k9GaBZXgIbiJ9Z0jD4hvDb6EYTpE0zXm7SUizeSO4Q3VNo3wTA 4mNW7vj5iZPrL0LofsM9K5c/aJGx0TQM2c4VCQJ8LEB2pNdJI1By4vtVFLcCfVrDm9up JChQ== X-Gm-Message-State: AOAM5333MHkDimt3OLqq9OWc5zCEdiJJISoL8LMhpiRDjS/KQUMMU3hj jcdl/NMATyXE4RzQ+QN/JAK6jTev6l+D054K7i5WQSiKfLHWa/F1ArmzAFtnw2bnk3+Xh4Yrlpn iRxMg+2Kgy4TFyM8= X-Received: by 2002:adf:a345:: with SMTP id d5mr2707725wrb.55.1601989000439; Tue, 06 Oct 2020 05:56:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxX8/rtlX/9R/0HtvfRUKeDnzH58wOuyHOuu7MluYltgob8IsSHLO2hsQPA0GvmKTfLk9T4Jw== X-Received: by 2002:adf:a345:: with SMTP id d5mr2707702wrb.55.1601989000248; Tue, 06 Oct 2020 05:56:40 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id z11sm4404934wru.88.2020.10.06.05.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 7/9] crypto: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:00 +0200 Message-Id: <20201006125602.2311423-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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_H5=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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 10 ++++++++++ crypto/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index f9d952d685..d064d07dae 100644 --- a/meson.build +++ b/meson.build @@ -1064,6 +1064,7 @@ block_ss = ss.source_set() bsd_user_ss = ss.source_set() chardev_ss = ss.source_set() common_ss = ss.source_set() +crypto_ss = ss.source_set() io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() @@ -1329,6 +1330,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +crypto_ss = crypto_ss.apply(config_host, strict: false) +libcrypto = static_library('crypto', crypto_ss.sources() + genh, + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto = declare_dependency(link_whole: libcrypto, + dependencies: [authz, qom]) + io_ss = io_ss.apply(config_host, strict: false) libio = static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], diff --git a/crypto/meson.build b/crypto/meson.build index f6f5ce1ecd..7f37b5d335 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -1,4 +1,3 @@ -crypto_ss = ss.source_set() crypto_ss.add(genh) crypto_ss.add(files( 'afsplit.c', @@ -52,15 +51,6 @@ if 'CONFIG_GNUTLS' in config_host endif -crypto_ss = crypto_ss.apply(config_host, strict: false) -libcrypto = static_library('crypto', crypto_ss.sources() + genh, - dependencies: [crypto_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -crypto = declare_dependency(link_whole: libcrypto, - dependencies: [authz, qom]) - util_ss.add(files('aes.c')) util_ss.add(files('init.c')) From patchwork Tue Oct 6 12:56:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271960 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21EF6C4363D for ; Tue, 6 Oct 2020 13:04:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 791012075A for ; Tue, 6 Oct 2020 13:04:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VObRGxsm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 791012075A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmdi-00036W-9q for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 09:04:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmWT-0003gB-6S for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27142) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmWQ-0001xn-86 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989009; 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=ZbwAwPx3ANbvemm3sKJq8R8pcWj7ZDfAwWyPc+pq4Mw=; b=VObRGxsmjDIcGnx1JRo0d2jgf+eK403X6EqXOsZWip7CK+wFTh8W1Fguxq9A/fSUVyFJE3 dOwyl+7Eg7PxmfnRbxJoYVH1cYXPWulkWQRjXNpWaj6RkmPVuIjzsSepNF6wPU0AwymW++ IkH4dsD7Tf7YeW6yJU/NBQN8mDKF08Q= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-hvVKA6eoMZyAgApUsAiR_A-1; Tue, 06 Oct 2020 08:56:46 -0400 X-MC-Unique: hvVKA6eoMZyAgApUsAiR_A-1 Received: by mail-wm1-f70.google.com with SMTP id p17so660612wmi.7 for ; Tue, 06 Oct 2020 05:56:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZbwAwPx3ANbvemm3sKJq8R8pcWj7ZDfAwWyPc+pq4Mw=; b=kzBjg85XvYTuenAkUFx9y2vUyxoXHL3PbHQK0NsnQtMe742xBsBOq7mRgygoSKfAu2 ZtBZDK84omCSQAmMfXQ1cAhRGD2O2bcFJko18MJ7dG5tWc7+v9DHK/XzfFl9BNx1rVJJ QbZtw90pIKhSilJoDQW9MD2lfvJM5v7hXlDNRZBNqCx+iQ9R2/nfbQJmiTDRvdGS86QR Rq6HSSrZg37pKIxrYvhcndxwu1p96fbHBNbhG752RW4FR7jO7uQRyIFXIQiEuQmt/Fyl qeTyp+ALePq1D2IqQxA52YyTWMHhziuE9OVMsdRnr47ky7Xyl6orBb8BODGKZcjMmN2x nYrw== X-Gm-Message-State: AOAM533hPxtcgR4CBzXHLCstq94/fwY8sHLZ3LggjXCID+bjvlbmsLiJ IrXR4eacdxAWCYrE26Nb94oP1ZhA6KvjDO34Kngx5e8uoi5HUBjX7eRumh575NvNPEC3yOoKTbm Q3zCFsYyXCDFNbG4= X-Received: by 2002:a7b:c0c8:: with SMTP id s8mr4590424wmh.78.1601989005459; Tue, 06 Oct 2020 05:56:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2atI0g0njW4x5KCvdzBpMWVn388OIIV8mTdOt8DT92+Kcm9+fdZCGGE1BfDRf3vPJEHbH9A== X-Received: by 2002:a7b:c0c8:: with SMTP id s8mr4590408wmh.78.1601989005296; Tue, 06 Oct 2020 05:56:45 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id u5sm5299722wru.63.2020.10.06.05.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 8/9] authz: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:01 +0200 Message-Id: <20201006125602.2311423-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 10 ++++++++++ authz/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index d064d07dae..73838d1d4f 100644 --- a/meson.build +++ b/meson.build @@ -1059,6 +1059,7 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', # Collect sourcesets. +authz_ss = ss.source_set() blockdev_ss = ss.source_set() block_ss = ss.source_set() bsd_user_ss = ss.source_set() @@ -1330,6 +1331,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +authz_ss = authz_ss.apply(config_host, strict: false) +libauthz = static_library('authz', authz_ss.sources() + genh, + dependencies: [authz_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +authz = declare_dependency(link_whole: libauthz, + dependencies: qom) + crypto_ss = crypto_ss.apply(config_host, strict: false) libcrypto = static_library('crypto', crypto_ss.sources() + genh, dependencies: [crypto_ss.dependencies()], diff --git a/authz/meson.build b/authz/meson.build index 516d71f2e2..88fa7769cb 100644 --- a/authz/meson.build +++ b/authz/meson.build @@ -1,4 +1,3 @@ -authz_ss = ss.source_set() authz_ss.add(genh) authz_ss.add(files( 'base.c', @@ -8,12 +7,3 @@ authz_ss.add(files( )) authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c')) - -authz_ss = authz_ss.apply(config_host, strict: false) -libauthz = static_library('authz', authz_ss.sources() + genh, - dependencies: [authz_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -authz = declare_dependency(link_whole: libauthz, - dependencies: qom) From patchwork Tue Oct 6 12:56:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271958 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCC2DC4363D for ; Tue, 6 Oct 2020 13:07:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3A76320760 for ; Tue, 6 Oct 2020 13:07:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IT3upaUR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A76320760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmh9-0006ko-8x for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 09:07:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmWW-0003ma-Nz for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmWU-0001yO-O4 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:56:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989014; 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=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=IT3upaURP2L2Gewykr/fcGJ7IKKRFdweJ+CuwF4WjGqPJza23eKmL2Ax594Z6rCiWyqgDX Fy/GbEXIChXTU3GZsGflrfEgaDi4gvRk+tWMKg3/zNyX5GPo0dm1LluYZhe8zx44C0cZFV vw3EyOcAgVH1T+D0ZrisMhf7ylhtPrY= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-3LKZSHNxN7WwhVPXZw6-Ug-1; Tue, 06 Oct 2020 08:56:52 -0400 X-MC-Unique: 3LKZSHNxN7WwhVPXZw6-Ug-1 Received: by mail-wm1-f70.google.com with SMTP id m14so670447wmi.0 for ; Tue, 06 Oct 2020 05:56:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=CZj3JUrsUx1a/PWWSU3qMQldrgO69eUI0ZYfkz0vgkGL88kC5McGRqrDte/ieZVl6k 6i9Oo4vztbG/03jw2rknyCyPGBYwNfUr6KeV7ifGPYMVJYVESe958zuYgn/njRGZglDA LbV59kWm9Fgf0RU2EPW9asjQbhzb9FM0KgOcTsJM8p62UMWMQ0fHnc9zx1hJLGueoVPp uBgFayAAJMVmroLvKRZ3ZeVD1GQSFS74GevcY4uQEJWCNtackU+1qougbH6pruZqH4DJ t3F0bbrUAMWBUkrqW14ajfQDu8bYcd5g0nyFThvzCuda5g11fCb4iuMszSuPcSf0+RhD iVyg== X-Gm-Message-State: AOAM5328QYezC6kUN2xqcvMxJK8olzTtB1y/mEQDXSSnrg5qJnSmrLZn MUqxH1b1e9zdY7DR/tfLD+w+mHzvqF48xc/2gJauJIISSyjW1l/BUvbqHBanT2ZcX9u2KD2NBYs IJm1JJGI5VVWnPdI= X-Received: by 2002:a1c:8104:: with SMTP id c4mr4885721wmd.112.1601989010591; Tue, 06 Oct 2020 05:56:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCW/FuG9EMZZBisRNBdS8c1CZVhlrB5OFZKV8YoBlijS+J1iKw82pFtZPS9kKyQKj20dCQMA== X-Received: by 2002:a1c:8104:: with SMTP id c4mr4885690wmd.112.1601989010423; Tue, 06 Oct 2020 05:56:50 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id m18sm3781973wmg.32.2020.10.06.05.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 9/9] qom: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:02 +0200 Message-Id: <20201006125602.2311423-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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_H5=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: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 8 ++++++++ qom/meson.build | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 73838d1d4f..72c8d3ad39 100644 --- a/meson.build +++ b/meson.build @@ -1069,6 +1069,7 @@ crypto_ss = ss.source_set() io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() +qom_ss = ss.source_set() softmmu_ss = ss.source_set() specific_fuzz_ss = ss.source_set() specific_ss = ss.source_set() @@ -1331,6 +1332,13 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', # Library dependencies # ######################## +qom_ss = qom_ss.apply(config_host, strict: false) +libqom = static_library('qom', qom_ss.sources() + genh, + dependencies: [qom_ss.dependencies()], + name_suffix: 'fa') + +qom = declare_dependency(link_whole: libqom) + authz_ss = authz_ss.apply(config_host, strict: false) libauthz = static_library('authz', authz_ss.sources() + genh, dependencies: [authz_ss.dependencies()], diff --git a/qom/meson.build b/qom/meson.build index a1cd03c82c..062a3789d8 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -1,4 +1,3 @@ -qom_ss = ss.source_set() qom_ss.add(genh) qom_ss.add(files( 'container.c', @@ -9,10 +8,3 @@ qom_ss.add(files( qmp_ss.add(files('qom-qmp-cmds.c')) softmmu_ss.add(files('qom-hmp-cmds.c')) - -qom_ss = qom_ss.apply(config_host, strict: false) -libqom = static_library('qom', qom_ss.sources() + genh, - dependencies: [qom_ss.dependencies()], - name_suffix: 'fa') - -qom = declare_dependency(link_whole: libqom)