meson: Build qemu-keymap when configured using --disable-tools
Subsystems (2)
v3 cover meson: Build qemu-keymap when configured using --disable-tools
Fix --enable-system --disable-tools builds.
Marc-André Lureau (1):
meson: convert pc-bios/keymaps/Makefile
Philippe Mathieu-Daudé (1):
meson: Do not consider qemu-keymap a 'tool'
Makefile | 8 ------ meson.build | 11 ++++---- pc-bios/keymaps/Makefile | 56 ------------------------------------- pc-bios/keymaps/meson.build | 56 +++++++++++++++++++++++++++++++++++++ pc-bios/meson.build | 1 + ui/meson.build | 2 +- 6 files changed, 64 insertions(+), 70 deletions(-) delete mode 100644 pc-bios/keymaps/Makefile create mode 100644 pc-bios/keymaps/meson.build
Signature · 1 line
2.26.2
PATCH v3 1/2 meson: convert pc-bios/keymaps/Makefile
From: Marc-André Lureau <[email protected]>
--- Makefile | 8 ------ pc-bios/keymaps/Makefile | 56 ------------------------------------- pc-bios/keymaps/meson.build | 56 +++++++++++++++++++++++++++++++++++++ pc-bios/meson.build | 1 + 4 files changed, 57 insertions(+), 64 deletions(-) delete mode 100644 pc-bios/keymaps/Makefile create mode 100644 pc-bios/keymaps/meson.build
Makefile +0 -8
@@ -229,11 +229,6 @@ distclean: clean ninja-distclean rm -f linux-headers/asm rm -Rf .sdk -KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \ -ar de en-us fi fr-be hr it lv nl pl ru th \ -de-ch es fo fr-ca hu ja mk pt sl tr \ -bepo cz - ifdef INSTALL_BLOBS BLOBS=bios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
@@ -298,9 +293,6 @@ endif $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" - set -e; for x in $(KEYMAPS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ - done ifdef CONFIG_WIN32
pc-bios/keymaps/Makefile deleted +0 -56
56 lines not on this page · raw message
pc-bios/keymaps/meson.build new file +56 -0
56 lines not on this page · raw message
pc-bios/meson.build +1 -0
@@ -25,3 +25,4 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host endif subdir('descriptors') +subdir('keymaps')
Signature · 1 line
2.26.2
Re: [PATCH v3 1/2] meson: convert pc-bios/keymaps/Makefile
pc-bios/meson.build if 'DECOMPRESS_EDK2_BLOBS' in config_host · line 28
Quoted 7 lines
pc-bios/meson.build +1
-0@@ -25,3 +25,4 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host endif subdir('descriptors') +subdir('keymaps')
Hmm, this hooks up the keymaps update to the default build. Not a good plan. The output is not static, but defaults on the libxkbcommon version you have installed. So I end up with a dirty tree now after each build.
I guess we should either return to the traditional behavior of not building keymaps by default and have a "make keymaps" or similar for keymap updates. Or write the generated maps to the build tree not the source tree.
take care,
Gerd
Re: [PATCH v3 1/2] meson: convert pc-bios/keymaps/Makefile
I think it should just add build_by_default: false with a comment explaining why.
Paolo
Il lun 24 ago 2020, 07:23 Gerd Hoffmann <[email protected]> ha scritto:
Quoted 22 lines
pc-bios/meson.build if 'DECOMPRESS_EDK2_BLOBS' in config_host · line 28
Quoted 7 lines
pc-bios/meson.build +1
-0@@ -25,3 +25,4 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host endif subdir('descriptors') +subdir('keymaps')Hmm, this hooks up the keymaps update to the default build. Not a good plan. The output is not static, but defaults on the libxkbcommon version you have installed. So I end up with a dirty tree now after each build.
I guess we should either return to the traditional behavior of not building keymaps by default and have a "make keymaps" or similar for keymap updates. Or write the generated maps to the build tree not the source tree.
take care,
Gerd
PATCH v3 2/2 meson: Do not consider qemu-keymap a 'tool'
In reply to Philippe Mathieu-Daudé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
---
v3: Rebased on Marc-André keymap patch
Paolo feel free to improve the subject if qemu-keymap is a tool :)
--- meson.build | 11 ++++++----- ui/meson.build | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-)
meson.build +6 -5
@@ -1062,6 +1062,12 @@ if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif +if 'CONFIG_XKBCOMMON' in config_host + # 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, + dependencies: [qemuutil, xkbcommon], install: have_tools) +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 +1084,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)
ui/meson.build +1 -1
@@ -95,7 +95,7 @@ keymaps = [ ['osx', 'qcode'], ] -if have_system +if have_system or have_tools foreach e : keymaps output = 'input-keymap-@0@-to-@[email protected]'.format(e[0], e[1]) genh += custom_target(output,
Signature · 1 line
2.26.2