system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-08 20:17:27 +00:00
Code Issues Projects Releases Wiki Activity

meson: avoid compiling qemu-keymap by default

Browse Source 
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>
This commit is contained in:
Laurent Vivier 2020-08-24 17:24:30 +02:00 committed by Gerd Hoffmann
parent 4113f4cfee
commit 9755c94a50
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -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,