From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build
Date: Tue, 5 Jun 2018 15:54:04 +0200 [thread overview]
Message-ID: <20180605135404.16301-1-laurent@vivier.eu> (raw)
linux-user targets don't need them, and if we ask to build statically
linked binaries some static binaries they need are not available.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
Makefile | 2 ++
tests/Makefile.include | 2 ++
2 files changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 6d588d1f71..5f198ee4bb 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,9 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
+ifeq ($(CONFIG_SOFTMMU),y)
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
+endif
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 86f90c0cb0..adaa5274c8 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -923,7 +923,9 @@ check-report.html: check-report.xml
# Other tests
+ifeq ($(CONFIG_SOFTMMU),y)
QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
+endif
.PHONY: check-tests/qemu-iotests-quick.sh
check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
--
2.14.3
next reply other threads:[~2018-06-05 13:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 13:54 Laurent Vivier [this message]
2018-06-05 14:00 ` [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build Peter Maydell
2018-06-05 15:38 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180605135404.16301-1-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).