From b1449edb799909f531b806538c48dc86d701c4b2 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Fri, 14 Jul 2017 09:33:45 +0100 Subject: [PATCH] configure: Don't build ivshmem tools unless CONFIG_IVSHMEM is set Don't try to build the ivshmem-server and ivshmem-client tools unless CONFIG_IVSHMEM is set. This fixes in passing a build bug on NetBSD, which fails to build the ivshmem tools because they use shm_open() and on NetBSD that requires linking against -lrt. Signed-off-by: Kamil Rytarowski Reviewed-by: Markus Armbruster Signed-off-by: Peter Maydell Message-id: 1500021225-4118-4-git-send-email-peter.maydell@linaro.org [PMM: moved some code into earlier patches; minor bugfixes; added commit message] Signed-off-by: Peter Maydell --- Makefile | 2 ++ Makefile.objs | 4 ++-- configure | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 38814f9a61..ef721480eb 100644 --- a/Makefile +++ b/Makefile @@ -470,10 +470,12 @@ ifneq ($(EXESUF),) qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) endif +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 vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) $(call LINK, $^) diff --git a/Makefile.objs b/Makefile.objs index bfd5a6ceb1..24a4ea08b8 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -107,8 +107,8 @@ qga-vss-dll-obj-y = qga/ ###################################################################### # contrib -ivshmem-client-obj-y = contrib/ivshmem-client/ -ivshmem-server-obj-y = contrib/ivshmem-server/ +ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ +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-libs := $(LIBISCSI_LIBS) diff --git a/configure b/configure index dbd131318f..c573a777fc 100755 --- a/configure +++ b/configure @@ -5048,6 +5048,8 @@ if test "$want_tools" = "yes" ; then tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" + fi + if [ "$ivshmem" = "yes" ]; then tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" fi fi -- GitLab