meson: Do not consider qemu-keymap a 'tool'
PATCH 1/1 meson: Do not consider qemu-keymap a 'tool'
We need qemu-keymap to generate the keymaps.
This fixes when configuring with --disable-tools:
Compiling C object qemu-keymap.p/qemu-keymap.c.o
Compiling C object qemu-keymap.p/ui_input-keymap.c.o
Compiling C object qemu-edid.p/qemu-edid.c.o
../ui/input-keymap.c:7:49: fatal error: ui/input-keymap-atset1-to-qcode.c.inc: No such file or directory compilation terminated.
Makefile.ninja:688: recipe for target 'qemu-keymap.p/ui_input-keymap.c.o' failed
make: *** [qemu-keymap.p/ui_input-keymap.c.o] Error 1
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
--- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meson.build +5 -5
@@ -1062,6 +1062,11 @@ if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif +if 'CONFIG_XKBCOMMON' in config_host +executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'), + dependencies: [qemuutil, xkbcommon], install: true) +endif + if have_tools qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep], dependencies: [authz, block, crypto, io, qom, qemuutil], install: true)
@@ -1078,11 +1083,6 @@ if have_tools subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') - if 'CONFIG_XKBCOMMON' in config_host - executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'), - dependencies: [qemuutil, xkbcommon], install: true) - endif - executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c'), dependencies: qemuutil, install: true)
Signature · 1 line
2.26.2