From: Laurent Vivier <laurent@vivier.eu>
Date: Mon, 24 Aug 2020 15:24:30 +0000 (+0200)
Subject: meson: avoid compiling qemu-keymap by default
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9755c94a50c8b845ad133a6e660f55ca131b9c7a;p=qemu.git

meson: avoid compiling qemu-keymap by default

qemu-keymap is not needed with linux-user, so disable it by default if
tools and system are disabled (tools are disabled by default with linux-user).

Avoid this error with statically linked binaries:

    Linking target qemu-keymap
    /usr/bin/ld: cannot find -lxkbcommon

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20200824152430.1844159-3-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/meson.build b/meson.build
index f6e346af1a..f0fe5f8799 100644
--- a/meson.build
+++ b/meson.build
@@ -1063,6 +1063,11 @@ if 'CONFIG_GUEST_AGENT' in config_host
   subdir('qga')
 endif
 
+# Don't build qemu-keymap if xkbcommon is not explicitly enabled
+# when we don't build tools or system
+if get_option('xkbcommon').auto() and not have_system and not have_tools
+  xkbcommon = not_found
+endif
 if xkbcommon.found()
   # used for the update-keymaps target, so include rules even if !have_tools
   qemu_keymap = executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c') + genh,