contrib/rdmacm-mux: convert to Meson
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>
This commit is contained in:
parent
99650b628f
commit
a9c9727c02
5
Makefile
5
Makefile
@ -311,7 +311,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 \
|
||||
@ -533,10 +532,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, $^)
|
||||
|
||||
|
@ -106,7 +106,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/
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
ifdef CONFIG_PVRDMA
|
||||
rdmacm-mux-obj-y = main.o
|
||||
endif
|
9
contrib/rdmacm-mux/meson.build
Normal file
9
contrib/rdmacm-mux/meson.build
Normal file
@ -0,0 +1,9 @@
|
||||
if 'CONFIG_PVRDMA' in config_host
|
||||
# if not found, CONFIG_PVRDMA should not be set
|
||||
# FIXME: broken on big endian architectures
|
||||
libumad = cc.find_library('ibumad', required: true)
|
||||
executable('rdmacm-mux', files('main.c'),
|
||||
dependencies: [glib, libumad],
|
||||
build_by_default: false,
|
||||
install: false)
|
||||
endif
|
@ -260,6 +260,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')
|
||||
|
Loading…
Reference in New Issue
Block a user