summary refs log tree commit diff stats
path: root/docs/devel
diff options
context:
space:
mode:
authorSteve Sistare <steven.sistare@oracle.com>2023-02-06 10:34:02 -0800
committerThomas Huth <thuth@redhat.com>2023-02-27 09:15:39 +0100
commitadf4c9bd2e274968e1abc2430376349eb3f3d392 (patch)
tree96917deab159ac98b68578bd6195c52e6dfa9c7f /docs/devel
parent5c70adbfbbf98c22d43fb4df1bac6802b6c61034 (diff)
downloadfocaccia-qemu-adf4c9bd2e274968e1abc2430376349eb3f3d392.tar.gz
focaccia-qemu-adf4c9bd2e274968e1abc2430376349eb3f3d392.zip
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 'docs/devel')
-rw-r--r--docs/devel/kconfig.rst2
1 files changed, 1 insertions, 1 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'] : []) + \
       ...