diff options
| author | Steve Sistare <steven.sistare@oracle.com> | 2023-02-06 10:34:02 -0800 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-02-27 09:15:39 +0100 |
| commit | adf4c9bd2e274968e1abc2430376349eb3f3d392 (patch) | |
| tree | 96917deab159ac98b68578bd6195c52e6dfa9c7f /pc-bios | |
| parent | 5c70adbfbbf98c22d43fb4df1bac6802b6c61034 (diff) | |
| download | qemu-adf4c9bd2e274968e1abc2430376349eb3f3d392.zip qemu-adf4c9bd2e274968e1abc2430376349eb3f3d392.tar.gz qemu-adf4c9bd2e274968e1abc2430376349eb3f3d392.tar.bz2 | |
meson: fix dependency on qemu-keymap
When qemu-keymap is not available on the host, and enable-xkbcommon
is specified, parallel make fails with:
% make clean
...
% make -j 32
...
FAILED: pc-bios/keymaps/is
./qemu-keymap -f pc-bios/keymaps/is -l is
/bin/sh: ./qemu-keymap: No such file or directory
... many similar messages ...
The code always runs find_program, rather than waiting to build
qemu-keymap, because it looks for CONFIG_XKBCOMMON in config_host
rather than config_host_data. Making serially succeeds, by soft
linking files from pc-bios/keymaps, but that is not the desired
result for enable-xkbcommon.
Examining all occurrences of 'in config_host' for similar bugs shows one
instance in the docs, which is also fixed here.
Fixes: 4113f4cfee ("meson: move xkbcommon to meson")
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1675708442-74966-1-git-send-email-steven.sistare@oracle.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/keymaps/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index 06c75e6..158a3b4 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -33,7 +33,7 @@ keymaps = { 'tr': '-l tr', } -if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in config_host +if meson.is_cross_build() or not xkbcommon.found() native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true) else native_qemu_keymap = qemu_keymap |