meson: qemu-pr-helper
The executable moves back from libexecdir to bindir, when it was in 5.0 and earlier. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
b7c70bf2c5
commit
897b5afae5
7
Makefile
7
Makefile
|
@ -138,7 +138,7 @@ $(call set-vpath, $(SRC_PATH))
|
||||||
|
|
||||||
LIBS+=-lz $(LIBS_TOOLS)
|
LIBS+=-lz $(LIBS_TOOLS)
|
||||||
|
|
||||||
HELPERS-y = $(HELPERS)
|
HELPERS-y =
|
||||||
|
|
||||||
# Sphinx does not allow building manuals into the same directory as
|
# Sphinx does not allow building manuals into the same directory as
|
||||||
# the source files, so if we're doing an in-tree QEMU build we must
|
# the source files, so if we're doing an in-tree QEMU build we must
|
||||||
|
@ -291,11 +291,6 @@ COMMON_LDADDS = libqemuutil.a
|
||||||
|
|
||||||
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
|
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
|
||||||
|
|
||||||
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
|
|
||||||
ifdef CONFIG_MPATH
|
|
||||||
scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
|
|
||||||
endif
|
|
||||||
|
|
||||||
clean: recurse-clean ninja-clean clean-ctlist
|
clean: recurse-clean ninja-clean clean-ctlist
|
||||||
-test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean
|
-test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean
|
||||||
# avoid old build problems by removing potentially incorrect old files
|
# avoid old build problems by removing potentially incorrect old files
|
||||||
|
|
|
@ -6717,7 +6717,6 @@ if [ "$eventfd" = "yes" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tools=""
|
tools=""
|
||||||
helpers=""
|
|
||||||
if test "$want_tools" = "yes" ; then
|
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-storage-daemon\$(EXESUF) $tools"
|
tools="qemu-storage-daemon\$(EXESUF) $tools"
|
||||||
|
@ -6741,7 +6740,6 @@ if test "$softmmu" = yes ; then
|
||||||
fi
|
fi
|
||||||
mpath=no
|
mpath=no
|
||||||
fi
|
fi
|
||||||
helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)"
|
|
||||||
else
|
else
|
||||||
if test "$virtfs" = yes; then
|
if test "$virtfs" = yes; then
|
||||||
error_exit "VirtFS is supported only on Linux"
|
error_exit "VirtFS is supported only on Linux"
|
||||||
|
@ -7819,7 +7817,6 @@ else
|
||||||
QEMU_INCLUDES="-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES"
|
QEMU_INCLUDES="-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "HELPERS=$helpers" >> $config_host_mak
|
|
||||||
echo "TOOLS=$tools" >> $config_host_mak
|
echo "TOOLS=$tools" >> $config_host_mak
|
||||||
echo "ROMS=$roms" >> $config_host_mak
|
echo "ROMS=$roms" >> $config_host_mak
|
||||||
echo "MAKE=$make" >> $config_host_mak
|
echo "MAKE=$make" >> $config_host_mak
|
||||||
|
|
10
meson.build
10
meson.build
|
@ -148,6 +148,10 @@ if 'CONFIG_XKBCOMMON' in config_host
|
||||||
link_args: config_host['XKBCOMMON_LIBS'].split())
|
link_args: config_host['XKBCOMMON_LIBS'].split())
|
||||||
endif
|
endif
|
||||||
rt = cc.find_library('rt', required: false)
|
rt = cc.find_library('rt', required: false)
|
||||||
|
libmpathpersist = not_found
|
||||||
|
if config_host.has_key('CONFIG_MPATH')
|
||||||
|
libmpathpersist = cc.find_library('mpathpersist')
|
||||||
|
endif
|
||||||
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(),
|
||||||
|
@ -633,6 +637,7 @@ foreach target : target_dirs
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
# Other build targets
|
# Other build targets
|
||||||
|
|
||||||
if 'CONFIG_GUEST_AGENT' in config_host
|
if 'CONFIG_GUEST_AGENT' in config_host
|
||||||
subdir('qga')
|
subdir('qga')
|
||||||
endif
|
endif
|
||||||
|
@ -674,6 +679,11 @@ if have_tools
|
||||||
dependencies: [qemuutil, libcap_ng],
|
dependencies: [qemuutil, libcap_ng],
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: get_option('libexecdir'))
|
install_dir: get_option('libexecdir'))
|
||||||
|
|
||||||
|
executable('qemu-pr-helper', files('scsi/qemu-pr-helper.c', 'scsi/utils.c'),
|
||||||
|
dependencies: [authz, crypto, io, qom, qemuutil,
|
||||||
|
libcap_ng, libudev, libmpathpersist],
|
||||||
|
install: true)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if 'CONFIG_IVSHMEM' in config_host
|
if 'CONFIG_IVSHMEM' in config_host
|
||||||
|
|
Loading…
Reference in New Issue