From nobody Mon Feb 9 18:46:00 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=1597762525; cv=none; d=zohomail.com; s=zohoarc; b=aQt5Rq0ebFoEepJMGyakfVoUGjme3nVr7y0bQya6NoctHGWDe6SZRmYg1SB7/MezuVpW6ac44ssbItqb2Wp8WnwUhUkRcGl3fsrgAH+YGNUJUPIQdUp53L5ngtKqPXb58NlpTbjsX1j/X0XDbOZ/ZhpNv6Zn0INhTJZMFMLB2KA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597762525; 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=oC0Ae4vV4d9FKcrgLCXkMmOiIlKmUqM6HeeNJGlSGTE=; b=HQO7VqtAl0ZpT5lXfIxfoVaHS7KqRG7ff0JQg4RS7Wm/SMDwijXr5PkIcBIB7QxY7cJsHLF4jo5ZbuQK19sFgbypy3/hzuklEbsNNL/OOR3YCjqIoRaDCXaJtROl1lSjkF7uVTZlGBwoYzp35perfaEnuwZeV5dqtmlX2mL+aDM= 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 1597762525093363.2896122701926; Tue, 18 Aug 2020 07:55:25 -0700 (PDT) Received: from localhost ([::1]:50662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k82qv-0002Kj-UX for importer@patchew.org; Tue, 18 Aug 2020 10:44:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k82Kz-0004W3-5a for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:42 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:48236 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k82Ks-0007Sq-7l for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:40 -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-471-cv2dJZJfNQWU0bwobwZp5Q-1; Tue, 18 Aug 2020 10:11:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1900C100A955 for ; Tue, 18 Aug 2020 14:11:28 +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 AC48B5D757; Tue, 18 Aug 2020 14:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597759891; 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=oC0Ae4vV4d9FKcrgLCXkMmOiIlKmUqM6HeeNJGlSGTE=; b=JuKmFsNKGXK72H6VAMO1STwaphs291n0w6MG7oPhm2G34siABMJC1N8tGw4iHulXbPYefO pXhlGq3WGufLPtx+5hlggk1JzaUQRAbQRABlynSenovaX5fku1bxWPKXN12by0A0wr96gv rxZpj00C5W4KxxmgeadyMyYQBtr34Uo= X-MC-Unique: cv2dJZJfNQWU0bwobwZp5Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 063/150] meson: convert chardev directory to Meson (tools part) Date: Tue, 18 Aug 2020 10:08:58 -0400 Message-Id: <20200818141025.21608-64-pbonzini@redhat.com> In-Reply-To: <20200818141025.21608-1-pbonzini@redhat.com> References: <20200818141025.21608-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 08:01:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 4 ++-- Makefile.target | 2 +- chardev/Makefile.objs | 19 ------------------- chardev/meson.build | 32 ++++++++++++++++++++++++++++++++ meson.build | 1 + 6 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 chardev/meson.build diff --git a/Makefile b/Makefile index a126963ab0..aaa0c3156b 100644 --- a/Makefile +++ b/Makefile @@ -173,7 +173,6 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - chardev-obj-y \ block-obj-y \ block-obj-m \ storage-daemon-obj-y \ diff --git a/Makefile.objs b/Makefile.objs index 0920cdb40c..297bd5beeb 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -7,8 +7,6 @@ qom-obj-y =3D qom/libqom.fa =20 ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) =20 -chardev-obj-y =3D chardev/ - authz-obj-y =3D authz/libauthz.fa authz/libauthz.fa-libs =3D $(if $(CONFIG_AUTH_PAM),-lpam) =20 @@ -19,6 +17,8 @@ block-obj-$(CONFIG_REPLICATION) +=3D replication.o =20 block-obj-m =3D block/ =20 +chardev-obj-y =3D chardev/libchardev.fa + crypto-obj-y =3D crypto/libcrypto.fa =20 io-obj-y =3D io/libio.fa diff --git a/Makefile.target b/Makefile.target index d1d8906b4d..6b9de09df5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -199,13 +199,13 @@ common-obj-m :=3D include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ authz-obj-y \ + chardev-obj-y \ crypto-obj-y \ io-obj-y \ qom-obj-y) dummy :=3D $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ - chardev-obj-y \ common-obj-y \ common-obj-m) all-obj-y +=3D $(common-obj-y) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index 3783dadc4c..6662d0df41 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -1,23 +1,4 @@ -chardev-obj-y +=3D char.o chardev-obj-$(CONFIG_SOFTMMU) +=3D chardev-sysemu.o -chardev-obj-$(CONFIG_WIN32) +=3D char-console.o -chardev-obj-$(CONFIG_POSIX) +=3D char-fd.o -chardev-obj-y +=3D char-fe.o -chardev-obj-y +=3D char-file.o -chardev-obj-y +=3D char-io.o -chardev-obj-y +=3D char-mux.o -chardev-obj-y +=3D char-null.o -chardev-obj-$(CONFIG_POSIX) +=3D char-parallel.o -chardev-obj-y +=3D char-pipe.o -chardev-obj-$(CONFIG_POSIX) +=3D char-pty.o -chardev-obj-y +=3D char-ringbuf.o -chardev-obj-y +=3D char-serial.o -chardev-obj-y +=3D char-socket.o -chardev-obj-y +=3D char-stdio.o -chardev-obj-y +=3D char-udp.o -chardev-obj-$(CONFIG_WIN32) +=3D char-win.o -chardev-obj-$(CONFIG_WIN32) +=3D char-win-stdio.o - common-obj-$(CONFIG_SOFTMMU) +=3D msmouse.o wctablet.o testdev.o =20 ifeq ($(CONFIG_BRLAPI),y) diff --git a/chardev/meson.build b/chardev/meson.build new file mode 100644 index 0000000000..a2e671ddfc --- /dev/null +++ b/chardev/meson.build @@ -0,0 +1,32 @@ +chardev_ss =3D ss.source_set() +chardev_ss.add(files( + 'char-fe.c', + 'char-file.c', + 'char-io.c', + 'char-mux.c', + 'char-null.c', + 'char-pipe.c', + 'char-ringbuf.c', + 'char-serial.c', + 'char-socket.c', + 'char-stdio.c', + 'char-udp.c', + 'char.c', +)) +chardev_ss.add(when: 'CONFIG_POSIX', if_true: files( + 'char-fd.c', + 'char-parallel.c', + 'char-pty.c', +)) +chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( + 'char-console.c', + 'char-win-stdio.c', + 'char-win.c', +)) + +chardev_ss =3D chardev_ss.apply(config_host, strict: false) +libchardev =3D static_library('chardev', chardev_ss.sources(), + name_suffix: 'fa', + build_by_default: false) + +chardev =3D declare_dependency(link_whole: libchardev) diff --git a/meson.build b/meson.build index bbb691ffa9..11ece643fc 100644 --- a/meson.build +++ b/meson.build @@ -451,6 +451,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 subdir('io') +subdir('chardev') subdir('fsdev') subdir('target') =20 --=20 2.26.2