mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-06 19:19:41 +00:00
contrib/ivshmem: convert to meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
ea458960ec
commit
5ee24e78f5
9
Makefile
9
Makefile
|
@ -303,8 +303,6 @@ dummy := $(call unnest-vars,, \
|
||||||
chardev-obj-y \
|
chardev-obj-y \
|
||||||
qga-obj-y \
|
qga-obj-y \
|
||||||
elf2dmp-obj-y \
|
elf2dmp-obj-y \
|
||||||
ivshmem-client-obj-y \
|
|
||||||
ivshmem-server-obj-y \
|
|
||||||
qga-vss-dll-obj-y \
|
qga-vss-dll-obj-y \
|
||||||
block-obj-y \
|
block-obj-y \
|
||||||
block-obj-m \
|
block-obj-m \
|
||||||
|
@ -517,13 +515,6 @@ endif
|
||||||
elf2dmp$(EXESUF): $(elf2dmp-obj-y)
|
elf2dmp$(EXESUF): $(elf2dmp-obj-y)
|
||||||
$(call LINK, $^)
|
$(call LINK, $^)
|
||||||
|
|
||||||
ifdef CONFIG_IVSHMEM
|
|
||||||
ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
|
|
||||||
$(call LINK, $^)
|
|
||||||
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
|
|
||||||
$(call LINK, $^)
|
|
||||||
endif
|
|
||||||
|
|
||||||
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
|
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
|
||||||
$(call quiet-command,$(PYTHON) $< $@ \
|
$(call quiet-command,$(PYTHON) $< $@ \
|
||||||
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
|
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
|
||||||
|
|
|
@ -104,7 +104,5 @@ qga-vss-dll-obj-y = qga/
|
||||||
######################################################################
|
######################################################################
|
||||||
# contrib
|
# contrib
|
||||||
elf2dmp-obj-y = contrib/elf2dmp/
|
elf2dmp-obj-y = contrib/elf2dmp/
|
||||||
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
|
|
||||||
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
3
configure
vendored
3
configure
vendored
|
@ -6729,9 +6729,6 @@ if test "$want_tools" = "yes" ; then
|
||||||
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
|
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
|
||||||
tools="qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools"
|
tools="qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools"
|
||||||
fi
|
fi
|
||||||
if [ "$ivshmem" = "yes" ]; then
|
|
||||||
tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
|
|
||||||
fi
|
|
||||||
if [ "$curl" = "yes" ]; then
|
if [ "$curl" = "yes" ]; then
|
||||||
tools="elf2dmp\$(EXESUF) $tools"
|
tools="elf2dmp\$(EXESUF) $tools"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
ivshmem-client-obj-y = ivshmem-client.o main.o
|
|
4
contrib/ivshmem-client/meson.build
Normal file
4
contrib/ivshmem-client/meson.build
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
executable('ivshmem-client', files('ivshmem-client.c', 'main.c'),
|
||||||
|
dependencies: glib,
|
||||||
|
build_by_default: targetos == 'linux',
|
||||||
|
install: false)
|
|
@ -1 +0,0 @@
|
||||||
ivshmem-server-obj-y = ivshmem-server.o main.o
|
|
4
contrib/ivshmem-server/meson.build
Normal file
4
contrib/ivshmem-server/meson.build
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
executable('ivshmem-server', files('ivshmem-server.c', 'main.c'),
|
||||||
|
dependencies: [qemuutil, rt],
|
||||||
|
build_by_default: targetos == 'linux',
|
||||||
|
install: false)
|
|
@ -94,6 +94,7 @@ libcap_ng = not_found
|
||||||
if 'CONFIG_LIBCAP_NG' in config_host
|
if 'CONFIG_LIBCAP_NG' in config_host
|
||||||
libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
|
libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
|
||||||
endif
|
endif
|
||||||
|
rt = cc.find_library('rt', required: false)
|
||||||
libiscsi = not_found
|
libiscsi = not_found
|
||||||
if 'CONFIG_LIBISCSI' in config_host
|
if 'CONFIG_LIBISCSI' in config_host
|
||||||
libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
|
libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
|
||||||
|
@ -283,6 +284,10 @@ if have_tools
|
||||||
subdir('contrib/vhost-user-input')
|
subdir('contrib/vhost-user-input')
|
||||||
subdir('contrib/vhost-user-scsi')
|
subdir('contrib/vhost-user-scsi')
|
||||||
endif
|
endif
|
||||||
|
if 'CONFIG_IVSHMEM' in config_host
|
||||||
|
subdir('contrib/ivshmem-client')
|
||||||
|
subdir('contrib/ivshmem-server')
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
subdir('tools')
|
subdir('tools')
|
||||||
|
|
Loading…
Reference in a new issue