From nobody Tue Feb 10 06:27: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=1597762344; cv=none; d=zohomail.com; s=zohoarc; b=KPe7CqIzDt3JbiHqj7Ecg1HaaTgK0rmVX78QyrEv+ozO+n3hP5vwZo9cwoKT0gZqtkpE+MDEIJTvbZV6vdenPpLkSuYCnb8DswJSSKzld8XuOQRU5aNC43cLU07fRYI2pkBWDXptjk2yYJlftCtpTACesHH6xnOcXoRJLxglFEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597762344; 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=U0QPDbEQdkW4Bm5ZySZZzUjE9jYzwisvzs5oGyYKIiI=; b=TC7v/KRw3byxHhhB8OOuzB+cfuPAv3Koi9MRpuT7hu0QVXW3qQDZsc+az2mlaoPX5D8BWzn87mTuvgzUXcBzhoSkymzXcQaGq5Xk0/k9Xt5WUmIGTHepOxlcinT5ZKTnZRX/Prv7GJi1fWpR3WyXkDT8Q9VswUv3ah8ADfpct+U= 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 1597762344779205.1010764454942; Tue, 18 Aug 2020 07:52:24 -0700 (PDT) Received: from localhost ([::1]:35980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k82yM-0002bw-Fz for importer@patchew.org; Tue, 18 Aug 2020 10:52:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k82L4-0004eU-C0 for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:56524 helo=us-smtp-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 1k82Kv-0007TH-Tr for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:45 -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-49-yGOBIUV-N9KdPiQTnjf1EA-1; Tue, 18 Aug 2020 10:11:31 -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 4F71C186A573 for ; Tue, 18 Aug 2020 14:11:30 +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 00BA85D757; Tue, 18 Aug 2020 14:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597759893; 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=U0QPDbEQdkW4Bm5ZySZZzUjE9jYzwisvzs5oGyYKIiI=; b=I0YkHWWZx814TIMikfmvfGbyweUFzhticy2ipwFVrCmWYIPJxfjUSZqkLMT7KQjYz30BR6 0S9jWFqBBJmYDpXMkKs41rfwzH+e/gHFmCUl7TYe8IcOHSqxiVKPmgrAE/XwuUvOezXYJS zQdactKYMgbmpK6Mr/hju2hxOpW2MFI= X-MC-Unique: yGOBIUV-N9KdPiQTnjf1EA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 068/150] meson: convert chardev directory to Meson (emulator part) Date: Tue, 18 Aug 2020 10:09:03 -0400 Message-Id: <20200818141025.21608-69-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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 06:40:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 2 -- Makefile.target | 2 ++ chardev/Makefile.objs | 10 ---------- chardev/meson.build | 13 +++++++++++++ configure | 2 ++ meson.build | 14 ++++++++++++++ 6 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 chardev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index eeaa0cfa82..e43526fe5f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -87,8 +87,6 @@ common-obj-y +=3D dma-helpers.o common-obj-$(CONFIG_TPM) +=3D tpm.o =20 common-obj-y +=3D backends/ -common-obj-y +=3D chardev/ -common-obj-m +=3D chardev/ =20 common-obj-$(CONFIG_SECCOMP) +=3D qemu-seccomp.o qemu-seccomp.o-cflags :=3D $(SECCOMP_CFLAGS) diff --git a/Makefile.target b/Makefile.target index c0575da132..c8c4b70162 100644 --- a/Makefile.target +++ b/Makefile.target @@ -104,6 +104,7 @@ all: $(PROGS) stap @true =20 obj-y +=3D $(LIBQEMU) + obj-y +=3D trace/ =20 ######################################################### @@ -167,6 +168,7 @@ LIBS :=3D $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) LIBS :=3D $(LIBS) endif +LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs deleted file mode 100644 index 6662d0df41..0000000000 --- a/chardev/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -chardev-obj-$(CONFIG_SOFTMMU) +=3D chardev-sysemu.o -common-obj-$(CONFIG_SOFTMMU) +=3D msmouse.o wctablet.o testdev.o - -ifeq ($(CONFIG_BRLAPI),y) -common-obj-m +=3D baum.o -baum.o-cflags :=3D $(SDL_CFLAGS) -baum.o-libs :=3D $(BRLAPI_LIBS) -endif - -common-obj-$(CONFIG_SPICE) +=3D spice.o diff --git a/chardev/meson.build b/chardev/meson.build index a2e671ddfc..f79efaaf09 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -30,3 +30,16 @@ libchardev =3D static_library('chardev', chardev_ss.sour= ces(), build_by_default: false) =20 chardev =3D declare_dependency(link_whole: libchardev) + +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')) + +chardev_modules =3D {} + +if config_host.has_key('CONFIG_BRLAPI') and config_host.has_key('CONFIG_SD= L') + module_ss =3D ss.source_set() + module_ss.add(when: [sdl, brlapi], if_true: files('baum.c')) + chardev_modules +=3D { 'brlapi': module_ss } +endif + +modules +=3D { 'chardev': chardev_modules } diff --git a/configure b/configure index e47a3acc3a..9563f2a38f 100755 --- a/configure +++ b/configure @@ -7344,6 +7344,8 @@ if test "$zlib" !=3D "no" ; then fi if test "$spice" =3D "yes" ; then echo "CONFIG_SPICE=3Dy" >> $config_host_mak + echo "SPICE_CFLAGS=3D$spice_cflags" >> $config_host_mak + echo "SPICE_LIBS=3D$spice_libs" >> $config_host_mak fi =20 if test "$smartcard" =3D "yes" ; then diff --git a/meson.build b/meson.build index 54d2a65fa4..7cb76884b0 100644 --- a/meson.build +++ b/meson.build @@ -144,6 +144,11 @@ if 'CONFIG_XKBCOMMON' in config_host xkbcommon =3D declare_dependency(compile_args: config_host['XKBCOMMON_CF= LAGS'].split(), link_args: config_host['XKBCOMMON_LIBS'].= split()) endif +spice =3D not_found +if 'CONFIG_SPICE' in config_host + spice =3D declare_dependency(compile_args: config_host['SPICE_CFLAGS'].s= plit(), + link_args: config_host['SPICE_LIBS'].split()) +endif rt =3D cc.find_library('rt', required: false) libmpathpersist =3D not_found if config_host.has_key('CONFIG_MPATH') @@ -178,6 +183,15 @@ libudev =3D not_found if 'CONFIG_LIBUDEV' in config_host libudev =3D declare_dependency(link_args: config_host['LIBUDEV_LIBS'].sp= lit()) endif +brlapi =3D not_found +if 'CONFIG_BRLAPI' in config_host + brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) +endif +sdl =3D not_found +if 'CONFIG_SDL' in config_host + sdl =3D declare_dependency(compile_args: config_host['SDL_CFLAGS'].split= (), + link_args: config_host['SDL_LIBS'].split()) +endif rbd =3D not_found if 'CONFIG_RBD' in config_host rbd =3D declare_dependency(link_args: config_host['RBD_LIBS'].split()) --=20 2.26.2