xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 05:20:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

contrib/vhost-user-blk: convert to Meson

Browse Source 
The GLib pkg-config information is extracted from config-host.mak and
used to link vhost-user-blk.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-06-10 12:18:02 +02:00
parent 3f99cf5710
commit 2d7ac0af9d
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -313,7 +313,6 @@ dummy := $(call unnest-vars,, \
ivshmem-server-obj-y \ ivshmem-server-obj-y \
rdmacm-mux-obj-y \ rdmacm-mux-obj-y \
vhost-user-scsi-obj-y \ vhost-user-scsi-obj-y \
vhost-user-blk-obj-y \
vhost-user-input-obj-y \ vhost-user-input-obj-y \
vhost-user-gpu-obj-y \ vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \ qga-vss-dll-obj-y \
@ -536,8 +535,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
endif endif
vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^) $(call LINK, $^)
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): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)

1
Makefile.objs
View File

@ -109,7 +109,6 @@ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
vhost-user-blk-obj-y = contrib/vhost-user-blk/
rdmacm-mux-obj-y = contrib/rdmacm-mux/ rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/

1
contrib/vhost-user-blk/Makefile.objs
View File

@ -1 +0,0 @@
vhost-user-blk-obj-y = vhost-user-blk.o

6
contrib/vhost-user-blk/meson.build Normal file
View File

@ -0,0 +1,6 @@
# FIXME: broken on 32-bit architectures
executable('vhost-user-blk', files('vhost-user-blk.c'),
link_with: libvhost_user,
dependencies: qemuutil,
build_by_default: false,
install: false)

1
meson.build
View File

@ -257,6 +257,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
if have_tools if have_tools
if 'CONFIG_VHOST_USER' in config_host if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user') subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
endif endif
endif endif