configure: disable qemu-keymap for linux-user qemu

[Qemu-devel] [PATCH] configure: disable qemu-keymap for linux-user qemu

Laurent Vivier posted 1 patch 6 years, 6 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171019191606.14129-1-laurent@vivier.eu

Test checkpatch passed

Test docker passed

Test s390x passed

configure | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH] configure: disable qemu-keymap for linux-user qemu

Posted by Laurent Vivier 6 years, 6 months ago

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 <laurent@vivier.eu>
---
 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
-- 
2.13.6