[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 019/142] contrib/rdmacm-mux: convert to Meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 019/142] contrib/rdmacm-mux: convert to Meson |
Date: |
Tue, 28 Jan 2020 18:51:39 +0100 |
We can use config-host.mak to decide whether the tool has to be built,
apart from that the conversion is straightforward.
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 5 -----
Makefile.objs | 1 -
contrib/rdmacm-mux/Makefile.objs | 3 ---
contrib/rdmacm-mux/meson.build | 6 ++++++
meson.build | 2 ++
5 files changed, 8 insertions(+), 9 deletions(-)
delete mode 100644 contrib/rdmacm-mux/Makefile.objs
create mode 100644 contrib/rdmacm-mux/meson.build
diff --git a/Makefile b/Makefile
index 2272d834cc..caafc07717 100644
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,6 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
- rdmacm-mux-obj-y \
vhost-user-input-obj-y \
vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \
@@ -499,10 +498,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y)
$(COMMON_LDADDS)
$(call LINK, $^)
endif
-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)
contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
diff --git a/Makefile.objs b/Makefile.objs
index 02cee554ad..e62cbeba4a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -108,7 +108,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/
-rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs
deleted file mode 100644
index 3df744af89..0000000000
--- a/contrib/rdmacm-mux/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-ifdef CONFIG_PVRDMA
-rdmacm-mux-obj-y = main.o
-endif
diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build
new file mode 100644
index 0000000000..29a9ced472
--- /dev/null
+++ b/contrib/rdmacm-mux/meson.build
@@ -0,0 +1,6 @@
+if 'CONFIG_PVRDMA' in config_host
+ # if not found, CONFIG_PVRDMA should not be set
+ libumad = cc.find_library('ibumad', required: true)
+ executable('rdmacm-mux', files('main.c'),
+ dependencies: [glib, libumad])
+endif
diff --git a/meson.build b/meson.build
index fd5a7aa2e8..4a69aad677 100644
--- a/meson.build
+++ b/meson.build
@@ -196,6 +196,8 @@ qemuutil = declare_dependency(link_with: libqemuutil,
# Other build targets
if have_tools
+ subdir('contrib/rdmacm-mux')
+
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
--
2.21.0
- [PATCH 010/142] meson: enable pie, (continued)
- [PATCH 010/142] meson: enable pie, Paolo Bonzini, 2020/01/28
- [PATCH 009/142] build-sys: add meson submodule, Paolo Bonzini, 2020/01/28
- [PATCH 007/142] configure: integrate Meson in the build system, Paolo Bonzini, 2020/01/28
- [PATCH 011/142] meson: use coverage option, Paolo Bonzini, 2020/01/28
- [PATCH 012/142] meson: add testsuite Makefile generator, Paolo Bonzini, 2020/01/28
- [PATCH 014/142] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2020/01/28
- [PATCH 016/142] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 015/142] meson: add version.o, Paolo Bonzini, 2020/01/28
- [PATCH 017/142] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 018/142] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 019/142] contrib/rdmacm-mux: convert to Meson,
Paolo Bonzini <=
- [PATCH 020/142] contrib/vhost-user-input: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 013/142] libqemuutil: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 021/142] contrib/vhost-user-gpu: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 022/142] contrib/ivshmem: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 023/142] contrib/elf2dmp: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 024/142] meson: convert qemu-ga, Paolo Bonzini, 2020/01/28
- [PATCH 025/142] meson: convert vss-win32, Paolo Bonzini, 2020/01/28
- [PATCH 026/142] meson: add msi generation, Paolo Bonzini, 2020/01/28
- [PATCH 027/142] meson: convert dummy Windows qga/qemu-ga target, Paolo Bonzini, 2020/01/28
- [PATCH 028/142] meson: add qemu-bridge-helper, Paolo Bonzini, 2020/01/28