From patchwork Tue Jun 12 10:58:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 928263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 414n2Q52zRz9s1B for ; Tue, 12 Jun 2018 20:59:26 +1000 (AEST) Received: from localhost ([::1]:54463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSh1I-0003SR-Bw for incoming@patchwork.ozlabs.org; Tue, 12 Jun 2018 06:59:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSh0l-0003Rt-PS for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:58:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSh0i-0007Az-QG for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:58:51 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36967) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSh0i-0007A6-FB for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:58:48 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MJYS7-1fPfni3ixf-0038EU; Tue, 12 Jun 2018 12:58:38 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 12 Jun 2018 12:58:26 +0200 Message-Id: <20180612105831.25703-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180612105831.25703-1-laurent@vivier.eu> References: <20180612105831.25703-1-laurent@vivier.eu> X-Provags-ID: V03:K1:Lnumqric8o/8llRfLfz8TiILCkZiqzildNpoMziBYC11GUTYNcD KFZFoaE+rHkKiO+7ckQK4YPZljpmGnzWgznANgMKCqLXCXzGFZYXG/35YgwolOJC9SM1DQh zgQeqbyZVrqwijPORh9SRahT0QdOXrYAK6wSlN613HEwd3R8p/zhg3HIgDUY7E3xqn+LgTd NQ//Mk5Mc4VLqds8jtPQA== X-UI-Out-Filterresults: notjunk:1; V01:K0:KNynux5wjQg=:L8J0hwF/SJKrhwWhsTdA8Q RZRRlSvA9sNrU9c6RDw31UAG3tYsS+ag5MYMzFlhb0GImOPnKwuaIbSw1i60f9S41gGgKa8Kn ze449ylmo/0nCISC/G5LzFoRkziioJDU/GajQhteZtJ/x+GcHJeLKEpOeTTi0Jms2DG3q3TJG /m/Xa9bsbKIDo0t4LPOe84Ziq92x2JzznovCSlhzoCNW9xR+Ziccb+yeIqoSc6V7ZB39Vc186 OFcUnQ8XmYG5zG183r3TU+76ex8dh+lcPX6yrEElYkukOUAVp6lB1gGlNfwDbXRSH9SvrS2kH w2L+Th1eGNmV89ZuVz6+uU79OPU4PwEf8cls6IdnSQqDL0P+OLa248GPUxetVgabaMyWTn7hM kNvqAoVzJdGxiOSgseNA7XWr00fvDe17Hx3LcF0DZUtNuJ+zMF3IiD/XtF7EFgIL0FMTMZhZ/ JwOpB7R4vGzTJpI7hJ+VvYuoRU4NMFw9o3Bj4VihUR7OYB5ECskoyYAp6No7MpOwojaz7KK40 7fohEAeMWBm3KiuhEZpAoW0ZUAFKvQYSyPtDGy1Kjk6L3N4b8UFlrEoXaI9F0IZcclfUO9nU0 QWR5GwEjQHFF3lauGkJIkCFE3r2H85wZj8RTzTpRASdny4F9pWT0VU8dC2MQuB0R0/ro/h4NO Ywa7b6tXsigomj2JRieyuVWgW9z1bbADP7+Xc8M97DlQDcD0yGyNNwfad9VGVWc9m6Fs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 3/8] linux-user: disable qemu-bridge-helper and socket_scm_helper build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" linux-user targets don't need them, and if we ask to build statically linked binaries, some static libraries they need are not available. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Message-Id: <20180605160958.5434-1-laurent@vivier.eu> --- Makefile | 2 +- tests/Makefile.include | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 023b3437ec..e4bc34a1cb 100644 --- a/Makefile +++ b/Makefile @@ -351,7 +351,7 @@ $(call set-vpath, $(SRC_PATH)) LIBS+=-lz $(LIBS_TOOLS) -HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) +HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) 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 d098a104bb..10397ed159 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -930,7 +930,7 @@ check-report.html: check-report.xml # Other tests -QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF) +QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) .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)