From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
berrange@redhat.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 5/8] libvhost-user: convert to Meson
Date: Wed, 10 Jul 2019 18:14:24 +0200 [thread overview]
Message-ID: <1562775267-1222-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1562775267-1222-1-git-send-email-pbonzini@redhat.com>
Since libqemuutil.a has been converted to Meson, the conversion is
straightforward.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 14 ++++----------
Makefile.objs | 1 -
contrib/libvhost-user/Makefile.objs | 1 -
contrib/libvhost-user/meson.build | 2 ++
meson.build | 4 ++++
5 files changed, 10 insertions(+), 12 deletions(-)
delete mode 100644 contrib/libvhost-user/Makefile.objs
create mode 100644 contrib/libvhost-user/meson.build
diff --git a/Makefile b/Makefile
index ddc7d27..3763d8c 100644
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,6 @@ dummy := $(call unnest-vars,, \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
rdmacm-mux-obj-y \
- libvhost-user-obj-y \
vhost-user-scsi-obj-y \
vhost-user-blk-obj-y \
vhost-user-input-obj-y \
@@ -422,11 +421,6 @@ $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
Makefile: $(version-obj-y)
######################################################################
-# Build libraries
-
-libvhost-user.a: $(libvhost-user-obj-y)
-
-######################################################################
COMMON_LDADDS = libqemuutil.a
@@ -517,21 +511,21 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(COMMON_LDADDS)
+vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
-vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a $(COMMON_LDADDS)
+vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
-vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) $(COMMON_LDADDS)
+vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
ifdef CONFIG_VHOST_USER_INPUT
ifdef CONFIG_LINUX
-vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a $(COMMON_LDADDS)
+vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
# build by default, do not install
diff --git a/Makefile.objs b/Makefile.objs
index 29ffaa3..0bcba93 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -114,7 +114,6 @@ qga-vss-dll-obj-y = qga/
elf2dmp-obj-y = contrib/elf2dmp/
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
-libvhost-user-obj-y = contrib/libvhost-user/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs
deleted file mode 100644
index ef3778e..0000000
--- a/contrib/libvhost-user/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o
diff --git a/contrib/libvhost-user/meson.build b/contrib/libvhost-user/meson.build
new file mode 100644
index 0000000..03ba2af
--- /dev/null
+++ b/contrib/libvhost-user/meson.build
@@ -0,0 +1,2 @@
+libvhost_user = static_library('vhost-user',
+ [files('libvhost-user.c', 'libvhost-user-glib.c')])
diff --git a/meson.build b/meson.build
index c625547..a0a8554 100644
--- a/meson.build
+++ b/meson.build
@@ -140,3 +140,7 @@ util_obj = util_obj.apply(config_host, strict: false)
libqemuutil = static_library('qemuutil',
sources: util_obj.sources(),
dependencies: util_obj.dependencies())
+
+# Other build targets
+
+subdir('contrib/libvhost-user')
--
1.8.3.1
next prev parent reply other threads:[~2019-07-10 16:22 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-10 16:14 [Qemu-devel] [RFC PATCH v2 0/8] Proof of concept for Meson integration Paolo Bonzini
2019-07-10 16:14 ` [Qemu-devel] [PATCH 1/8] configure: do not include $(...) variables in config-host.mak Paolo Bonzini
2019-07-10 16:14 ` [Qemu-devel] [PATCH 2/8] configure: set $PYTHON to a full path Paolo Bonzini
2019-07-10 16:14 ` [Qemu-devel] [PATCH 3/8] configure: integrate Meson in the build system Paolo Bonzini
2019-07-10 16:14 ` [Qemu-devel] [PATCH 4/8] convert libqemuutil to meson Paolo Bonzini
2019-07-13 14:15 ` Markus Armbruster
2019-07-13 21:26 ` Paolo Bonzini
2019-07-27 7:16 ` Markus Armbruster
2019-07-27 12:23 ` Paolo Bonzini
2019-07-27 18:20 ` Peter Maydell
2019-07-29 7:09 ` Markus Armbruster
2019-07-29 8:51 ` Paolo Bonzini
2019-07-29 9:21 ` Peter Maydell
2019-07-29 9:29 ` Paolo Bonzini
2019-07-29 9:32 ` Peter Maydell
2019-07-29 9:36 ` Paolo Bonzini
2019-07-29 11:12 ` Markus Armbruster
2019-07-29 8:21 ` Daniel P. Berrangé
2019-07-29 9:19 ` Peter Maydell
2019-07-29 12:41 ` Alex Bennée
2019-07-29 14:08 ` Paolo Bonzini
2019-07-10 16:14 ` Paolo Bonzini [this message]
2019-07-10 16:14 ` [Qemu-devel] [PATCH 6/8] vhost-user-blk: convert to Meson Paolo Bonzini
2019-07-10 16:14 ` [Qemu-devel] [PATCH 7/8] vhost-user-scsi: " Paolo Bonzini
2019-07-10 16:14 ` [Qemu-devel] [PATCH 8/8] rdmacm-mux: " Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1562775267-1222-6-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).