[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 26/33] meson: fix dependency on qemu-keymap
From: |
Thomas Huth |
Subject: |
[PULL 26/33] meson: fix dependency on qemu-keymap |
Date: |
Mon, 27 Feb 2023 12:36:14 +0100 |
From: Steve Sistare <steven.sistare@oracle.com>
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>
---
docs/devel/kconfig.rst | 2 +-
pc-bios/keymaps/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst
index 69674d008a..cc1a456edf 100644
--- a/docs/devel/kconfig.rst
+++ b/docs/devel/kconfig.rst
@@ -306,6 +306,6 @@ variable::
host_kconfig = \
(have_tpm ? ['CONFIG_TPM=y'] : []) + \
- ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
+ ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=y'] : []) + \
(have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
...
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
index 06c75e646b..158a3b410c 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
--
2.31.1
- [PULL 33/33] Deprecate the "-no-acpi" command line switch, (continued)
- [PULL 33/33] Deprecate the "-no-acpi" command line switch, Thomas Huth, 2023/02/27
- [PULL 32/33] gitlab-ci.d/base: Mark jobs as interruptible by default, Thomas Huth, 2023/02/27
- [PULL 21/33] target/s390x: Use tcg_constant_* in translate_vx.c.inc, Thomas Huth, 2023/02/27
- [PULL 17/33] s390x/pv: Add support for asynchronous teardown for reboot, Thomas Huth, 2023/02/27
- [PULL 23/33] tests/tcg/s390x: Add sam.S, Thomas Huth, 2023/02/27
- [PULL 28/33] gitlab-ci.d/buildtest: Remove aarch64-softmmu from the build-system-ubuntu job, Thomas Huth, 2023/02/27
- [PULL 31/33] gitlab-ci.d: Build with --enable-fdt=system by default, Thomas Huth, 2023/02/27
- [PULL 27/33] Updated the FSF address to <https://www.gnu.org/licenses/>, Thomas Huth, 2023/02/27
- [PULL 18/33] target/s390x: Use tcg_constant_* in local contexts, Thomas Huth, 2023/02/27
- [PULL 25/33] qemu-keymap: Silence memory leak warning from Clang's sanitizer, Thomas Huth, 2023/02/27
- [PULL 26/33] meson: fix dependency on qemu-keymap,
Thomas Huth <=
- [PULL 30/33] gitlab-ci.d/buildtest-template: Simplify the configure step, Thomas Huth, 2023/02/27
- Re: [PULL 00/33] s390x and testing related patches, Peter Maydell, 2023/02/27