@@ -63,6 +63,7 @@
/qemu-version.h.tmp
/module_block.h
/scsi/qemu-pr-helper
+/contrib/rdmacm-mux/rdmacm-mux
/contrib/vhost-user-scsi/vhost-user-scsi
/contrib/vhost-user-blk/vhost-user-blk
/fsdev/virtfs-proxy-helper
@@ -322,7 +322,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 \
@@ -510,10 +509,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, $^)
@@ -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/
-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/
deleted file mode 100644
@@ -1,3 +0,0 @@
-ifdef CONFIG_PVRDMA
-rdmacm-mux-obj-y = main.o
-endif
new file mode 100644
@@ -0,0 +1,6 @@
+if config_host['CONFIG_PVRDMA'] == 'y'
+ # 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
@@ -1,4 +1,5 @@
project('qemu', 'c', meson_version: '>=0.50.999')
+cc = meson.get_compiler('c')
kconfig = import('unstable-kconfig')
ss = import('sourceset')
@@ -148,5 +149,6 @@ libqemuutil = static_library('qemuutil',
# Other build targets
subdir('contrib/libvhost-user')
+subdir('contrib/rdmacm-mux')
subdir('contrib/vhost-user-blk')
subdir('contrib/vhost-user-scsi')
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 <pbonzini@redhat.com> --- .gitignore | 1 + Makefile | 5 ----- Makefile.objs | 1 - contrib/rdmacm-mux/Makefile.objs | 3 --- contrib/rdmacm-mux/meson.build | 6 ++++++ meson.build | 2 ++ 6 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 contrib/rdmacm-mux/Makefile.objs create mode 100644 contrib/rdmacm-mux/meson.build