From nobody Sun Nov 16 23:02:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601982770; cv=none; d=zohomail.com; s=zohoarc; b=Oz0z9dhkJ/nRKpVA947YN5Qq2m7UGc/REXRhSKgL8Uavw5S2OfjvMlTyD761am2qTcVDxEUTHddhYbCzRsY+aPLllAcT8x0lC1xQ+K+WzsxBXN/kxHpvk4vFbiKpxX2CUBkyHJ0M+Qw/CQMosFJDKybdJrtzwf8/zbMGveC3doQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982770; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=BKqEEWSZWPIXjq0Tj3/IAfDoo8ykF8LYWdg8EMySCCE=; b=PN6y41N6JfhRwNq8ogLxCgmiopvbd14ywMC/zeHL30EUN1B42vL5hdq4DaUxkRzH6VhGcNzhDz9T65hK8unqiAtQCM7oFQRRbDJAWYeXo7TJzXuStEysxOtY0LdnqRgFowZSVmfxc9bcFpMYck46ayXDckjuYzq32TjNmQbvUVo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601982770837474.21855422968133; Tue, 6 Oct 2020 04:12:50 -0700 (PDT) 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-221-HEqER9qMMzi0UogKLJE87A-1; Tue, 06 Oct 2020 07:12:48 -0400 Received: by mail-wm1-f72.google.com with SMTP id d76so980783wmd.8 for ; Tue, 06 Oct 2020 04:12:47 -0700 (PDT) Return-Path: Return-Path: 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 n10sm3548248wmk.7.2020.10.06.04.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982769; 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=BKqEEWSZWPIXjq0Tj3/IAfDoo8ykF8LYWdg8EMySCCE=; b=agptUs5yGvSQszEvahz1EtyhljqZ9US7M+aGnQ1aqmE+VQXqmx5oXEBjwRBjyMMUZd2Txi lQDcA/Q29CLFMSa54d7XHMN7KY5MC3BRAWWjLJwMVkAzsnmMCoOzl+MzPadUa3sYUBgRA5 vgnJV4lmHnFopFCD+G+lEvwH4dngpfo= X-MC-Unique: HEqER9qMMzi0UogKLJE87A-1 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=BKqEEWSZWPIXjq0Tj3/IAfDoo8ykF8LYWdg8EMySCCE=; b=l96DZfmF+BHAjVTLonx5LZWbjmam1jT3shld9A+FJqmJNtfah4oSHONb5JjKrMAmkm +c9P6cHfTuf9/xpTgFQIKA+uwRuzE8sd6l80wLrxCrleXslg/dHSuOm3z/x9vIYlj2w9 M0OwtxPdjqsxvdQ3MdzOuZK00Z7D5pp9XCHszQfqFkHJQotNMRXHij69MklH6hiCn8Xy xSqRJsKt2683i6IhUotwuh3YwXkdyHPVOCB3eWhBYVi0QWDjG0yZphfRv8g8gQupFL22 lxTNK1Cw8weV21IVVhtbp9WsPD5vFJjrZn5LBbpXbDk1JH2CEGYsoyd0PDdXdiBigsJ7 p4Cg== X-Gm-Message-State: AOAM533Nl/k6BaeMag9N//UrOHenhu/F0ojpd1u40/RFE2RYCxUE+IPg X5EWZ0Rz1ujUUgWCrW46YjAwYosIxOggF49UFWdwgFulAEJpQU6+fThdVNIrzVYFdn/7nV0d9oc cHRwQE2tVfPu/fg== X-Received: by 2002:a1c:cc18:: with SMTP id h24mr4253865wmb.170.1601982766686; Tue, 06 Oct 2020 04:12:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMy/QU2uilQ/Xyup8ZFTEoGJqUG3jSl3lY0ZpSCF7XJgsUaz8JTmrGCdwQlwXTwBGoQgTf8Q== X-Received: by 2002:a1c:cc18:: with SMTP id h24mr4253842wmb.170.1601982766507; Tue, 06 Oct 2020 04:12:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 05/10] chardev: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:14 +0200 Message-Id: <20201006111219.2300921-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 7 +++++++ chardev/meson.build | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index ccfa3e9531..6bec7a0994 100644 --- a/meson.build +++ b/meson.build @@ -1062,6 +1062,7 @@ sphinx_extn_depends =3D [ meson.source_root() / 'docs= /sphinx/depfile.py', blockdev_ss =3D ss.source_set() block_ss =3D ss.source_set() bsd_user_ss =3D ss.source_set() +chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() @@ -1346,6 +1347,12 @@ libqmp =3D static_library('qmp', qmp_ss.sources() + = genh, =20 qmp =3D declare_dependency(link_whole: [libqmp]) =20 +libchardev =3D static_library('chardev', chardev_ss.sources() + genh, + name_suffix: 'fa', + build_by_default: false) + +chardev =3D declare_dependency(link_whole: libchardev) + libhwcore =3D 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 =3D 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( )) =20 chardev_ss =3D chardev_ss.apply(config_host, strict: false) -libchardev =3D static_library('chardev', chardev_ss.sources() + genh, - name_suffix: 'fa', - build_by_default: false) - -chardev =3D declare_dependency(link_whole: libchardev) =20 softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testd= ev.c')) softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) --=20 2.26.2