From patchwork Thu Oct 19 19:16:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 828321 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=) 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 3yHzH73vFLz9t41 for ; Fri, 20 Oct 2017 06:18:27 +1100 (AEDT) Received: from localhost ([::1]:50915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5GKn-0000Et-LE for incoming@patchwork.ozlabs.org; Thu, 19 Oct 2017 15:18:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5GIy-0007kL-SR for qemu-devel@nongnu.org; Thu, 19 Oct 2017 15:16:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5GIt-0006Rl-TX for qemu-devel@nongnu.org; Thu, 19 Oct 2017 15:16:32 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:61896) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e5GIt-0006Qm-Ji for qemu-devel@nongnu.org; Thu, 19 Oct 2017 15:16:27 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MZwSd-1dnJXv2xQd-00Lr3g; Thu, 19 Oct 2017 21:16:20 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Oct 2017 21:16:06 +0200 Message-Id: <20171019191606.14129-1-laurent@vivier.eu> X-Mailer: git-send-email 2.13.6 X-Provags-ID: V03:K0:NXTjjyhXUr9sRyV3lLNyCWYoeaGNWn20cGKdJQ/qfv/9XbWh4Pq 1D16kUdu5CD/1bzS+e/ChKVeJOKF/c24lBOGCQvrUjQulew57yDqpYNtdF8TwgcNZg4KzfM GqW7cjW+jg6NClU4/zIJYWLPWzdIwiSIvztKnnrOXbpYyE+jCAsAceHd/t3TasOdKLOmnZd hrqsUYmwjPXpRF6K+gBfQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:AabKf3YfBbE=:Ccb/lBU9VT+Q9g4dFiCvu6 W6leWO6z1idDvNY1B3l8CMAqJeXbvXdQcL4em613l/lB31NQWLkDdrl1IymPPIw69NfmK8tLJ cAM9kX9jyL58Nj31nSEe8eDq2byf4iGguhUgReCAGz/sDEQGAnHtejEaxXpfJw71rAiw45nXQ dTJqpp+sK7i1/Vy+kBCO0c0w15e4D1VWUQ6ACOx+e+p3PBUcKGTKPWHl06LpuuMGf/B9aTtRJ 18uiucOGqrkFG6gBSg+M94oShGJ9NKciAITY+U6wekeDsw4QTGd48RgzL9PQKL/sAbj1b5ySr DbwVw9ucEqizMVtHEo1tJXNbKiRE5sZCewPswzuKvEG3GS0NXuFpRpnuh4TftJBKZ6Op+1ltl ZEtFJ5G1ZFcPi6iYkBqKL5Z7JCLAbgokW5fXjNIzdr5XyX9qOC9rFhYkrJrZ+MKIz3xKCTo/U Erbe1CU05doPXwg9J3/DKuCj2SZl6s67F+Yyhu5JkfqbtMpDv/fHkouQbLtLeFKEc5BBnLH9d TliAw2drTQmUADVcZ3lu4/rlexr/4HRbCUi3po/rgf1hyjjuy3x5UXEz0dYV8cJVwdeaiRnPP STZ5O7J4+NIWjUaXhNJkeR38dcljvFtrdAJkB345Ltf5GIdLQRlEXl4pXjMOAGb+Pjml2i6tX UMKXzTgR8u8UDCINZ6NlhGPCslPEghhz3W84vvczPrUF/S3D+qAK/CiFDaKQb/jEGqRoEjAkC S9RDLJfBWnqMDDt4Mo2ca1F+k+qWBECbsdjrMQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH] configure: disable qemu-keymap for linux-user qemu 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: Peter Maydell , Gerd Hoffmann , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We don't need qemu-keymap when we build only linux-user qemu. When we compile in static mode, the libxkbcommon is detected by configure if the shared one is available, but cannot be linked if the static version is not available. As we don't need it for qemu-linux-user, and we generally need a static link to use it in a chroot, disable qemu-keymap in this case. Signed-off-by: Laurent Vivier --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6f21aaf989..03547cea6a 100755 --- a/configure +++ b/configure @@ -5136,9 +5136,9 @@ if test "$softmmu" = yes ; then fi mpath=no fi -fi -if test "$xkbcommon" = "yes"; then - tools="qemu-keymap\$(EXESUF) $tools" + if test "$xkbcommon" = "yes"; then + tools="qemu-keymap\$(EXESUF) $tools" + fi fi # Probe for guest agent support/options