mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-22 02:44:53 +00:00
contrib/libvhost-user: convert to Meson
Since libqemuutil.a has been converted to Meson, the conversion is straightforward. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
04c6f1e798
commit
931049b46c
16
Makefile
16
Makefile
|
@ -318,7 +318,6 @@ dummy := $(call unnest-vars,, \
|
||||||
ivshmem-server-obj-y \
|
ivshmem-server-obj-y \
|
||||||
virtiofsd-obj-y \
|
virtiofsd-obj-y \
|
||||||
rdmacm-mux-obj-y \
|
rdmacm-mux-obj-y \
|
||||||
libvhost-user-obj-y \
|
|
||||||
vhost-user-scsi-obj-y \
|
vhost-user-scsi-obj-y \
|
||||||
vhost-user-blk-obj-y \
|
vhost-user-blk-obj-y \
|
||||||
vhost-user-input-obj-y \
|
vhost-user-input-obj-y \
|
||||||
|
@ -443,11 +442,6 @@ $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
|
||||||
|
|
||||||
Makefile: $(version-obj-y)
|
Makefile: $(version-obj-y)
|
||||||
|
|
||||||
######################################################################
|
|
||||||
# Build libraries
|
|
||||||
|
|
||||||
libvhost-user.a: $(libvhost-user-obj-y)
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
COMMON_LDADDS = libqemuutil.a
|
COMMON_LDADDS = libqemuutil.a
|
||||||
|
@ -546,9 +540,9 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
|
||||||
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
|
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
|
||||||
$(call LINK, $^)
|
$(call LINK, $^)
|
||||||
endif
|
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, $^)
|
$(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, $^)
|
$(call LINK, $^)
|
||||||
|
|
||||||
rdmacm-mux$(EXESUF): LIBS += "-libumad"
|
rdmacm-mux$(EXESUF): LIBS += "-libumad"
|
||||||
|
@ -557,16 +551,16 @@ rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
|
||||||
|
|
||||||
# relies on Linux-specific syscalls
|
# relies on Linux-specific syscalls
|
||||||
ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
|
ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
|
||||||
virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS)
|
virtiofsd$(EXESUF): $(virtiofsd-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
|
||||||
$(call LINK, $^)
|
$(call LINK, $^)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) libvhost-user.a $(COMMON_LDADDS)
|
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
|
||||||
$(call LINK, $^)
|
$(call LINK, $^)
|
||||||
|
|
||||||
ifdef CONFIG_VHOST_USER_INPUT
|
ifdef CONFIG_VHOST_USER_INPUT
|
||||||
ifdef CONFIG_LINUX
|
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, $^)
|
$(call LINK, $^)
|
||||||
|
|
||||||
# build by default, do not install
|
# build by default, do not install
|
||||||
|
|
|
@ -106,7 +106,6 @@ qga-vss-dll-obj-y = qga/
|
||||||
elf2dmp-obj-y = contrib/elf2dmp/
|
elf2dmp-obj-y = contrib/elf2dmp/
|
||||||
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
|
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
|
||||||
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
|
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-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/
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o
|
|
3
contrib/libvhost-user/meson.build
Normal file
3
contrib/libvhost-user/meson.build
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
libvhost_user = static_library('vhost-user',
|
||||||
|
files('libvhost-user.c', 'libvhost-user-glib.c'),
|
||||||
|
build_by_default: false)
|
|
@ -243,6 +243,14 @@ libqemuutil = static_library('qemuutil',
|
||||||
qemuutil = declare_dependency(link_with: libqemuutil,
|
qemuutil = declare_dependency(link_with: libqemuutil,
|
||||||
sources: genh + version_res)
|
sources: genh + version_res)
|
||||||
|
|
||||||
|
# Other build targets
|
||||||
|
|
||||||
|
if have_tools
|
||||||
|
if 'CONFIG_VHOST_USER' in config_host
|
||||||
|
subdir('contrib/libvhost-user')
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
summary_info = {}
|
summary_info = {}
|
||||||
summary_info += {'Install prefix': config_host['prefix']}
|
summary_info += {'Install prefix': config_host['prefix']}
|
||||||
summary_info += {'BIOS directory': config_host['qemu_datadir']}
|
summary_info += {'BIOS directory': config_host['qemu_datadir']}
|
||||||
|
|
Loading…
Reference in a new issue