From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL 2/3] meson: move xkbcommon to meson
Date: Tue, 25 Aug 2020 08:20:07 +0200 [thread overview]
Message-ID: <20200825062008.6502-3-kraxel@redhat.com> (raw)
In-Reply-To: <20200825062008.6502-1-kraxel@redhat.com>
From: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20200824152430.1844159-2-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
configure | 29 ++++-------------------------
meson_options.txt | 1 +
meson.build | 11 ++++++-----
ui/meson.build | 2 +-
4 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/configure b/configure
index 377aafa2acd5..b1e11397a827 100755
--- a/configure
+++ b/configure
@@ -432,7 +432,7 @@ vde=""
vnc_sasl="auto"
vnc_jpeg="auto"
vnc_png="auto"
-xkbcommon=""
+xkbcommon="auto"
xen=""
xen_ctrl_version=""
xen_pci_passthrough=""
@@ -1631,9 +1631,9 @@ for opt do
;;
--disable-libpmem) libpmem=no
;;
- --enable-xkbcommon) xkbcommon=yes
+ --enable-xkbcommon) xkbcommon="enabled"
;;
- --disable-xkbcommon) xkbcommon=no
+ --disable-xkbcommon) xkbcommon="disabled"
;;
--enable-plugins) plugins="yes"
;;
@@ -3446,22 +3446,6 @@ EOF
fi
fi
-##########################################
-# xkbcommon probe
-if test "$xkbcommon" != "no" ; then
- if $pkg_config xkbcommon --exists; then
- xkbcommon_cflags=$($pkg_config xkbcommon --cflags)
- xkbcommon_libs=$($pkg_config xkbcommon --libs)
- xkbcommon=yes
- else
- if test "$xkbcommon" = "yes" ; then
- feature_not_found "xkbcommon" "Install libxkbcommon-devel"
- fi
- xkbcommon=no
- fi
-fi
-
-
##########################################
# xfsctl() probe, used for file-posix.c
if test "$xfs" != "no" ; then
@@ -6827,11 +6811,6 @@ if test "$audio_win_int" = "yes" ; then
fi
echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
-if test "$xkbcommon" = "yes" ; then
- echo "CONFIG_XKBCOMMON=y" >> $config_host_mak
- echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak
- echo "XKBCOMMON_LIBS=$xkbcommon_libs" >> $config_host_mak
-fi
if test "$xfs" = "yes" ; then
echo "CONFIG_XFS=y" >> $config_host_mak
fi
@@ -8251,7 +8230,7 @@ NINJA=$PWD/ninjatool $meson setup \
-Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
-Dsdl=$sdl -Dsdl_image=$sdl_image \
-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
- -Dgettext=$gettext \
+ -Dgettext=$gettext -Dxkbcommon=$xkbcommon \
$cross_arg \
"$PWD" "$source_path"
diff --git a/meson_options.txt b/meson_options.txt
index e5f45243ce78..c55f9cd94cb2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,3 +5,4 @@ option('vnc', type : 'feature', value : 'enabled')
option('vnc_jpeg', type : 'feature', value : 'auto')
option('vnc_png', type : 'feature', value : 'auto')
option('vnc_sasl', type : 'feature', value : 'auto')
+option('xkbcommon', type : 'feature', value : 'auto')
diff --git a/meson.build b/meson.build
index df5bf728b57a..f6e346af1a69 100644
--- a/meson.build
+++ b/meson.build
@@ -152,10 +152,10 @@ libcap_ng = not_found
if 'CONFIG_LIBCAP_NG' in config_host
libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
endif
-xkbcommon = not_found
-if 'CONFIG_XKBCOMMON' in config_host
- xkbcommon = declare_dependency(compile_args: config_host['XKBCOMMON_CFLAGS'].split(),
- link_args: config_host['XKBCOMMON_LIBS'].split())
+xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'), static: enable_static,
+ include_type: 'system')
+if xkbcommon.found()
+ xkbcommon = declare_dependency(dependencies: xkbcommon)
endif
slirp = not_found
if config_host.has_key('CONFIG_SLIRP')
@@ -389,6 +389,7 @@ config_host_data.set('CONFIG_VNC', vnc.found())
config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
config_host_data.set('CONFIG_VNC_PNG', png.found())
config_host_data.set('CONFIG_VNC_SASL', sasl.found())
+config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0])
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
@@ -1062,7 +1063,7 @@ if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga')
endif
-if 'CONFIG_XKBCOMMON' in config_host
+if xkbcommon.found()
# 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)
diff --git a/ui/meson.build b/ui/meson.build
index 81fd393432a4..018c5698bf66 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -95,7 +95,7 @@ keymaps = [
['osx', 'qcode'],
]
-if have_system or 'CONFIG_XKBCOMMON' in config_host
+if have_system or xkbcommon.found()
foreach e : keymaps
output = 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1])
genh += custom_target(output,
--
2.27.0
next prev parent reply other threads:[~2020-08-25 6:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 6:20 [PULL 0/3] Fixes 20200825 patches Gerd Hoffmann
2020-08-25 6:20 ` [PULL 1/3] meson: drop keymaps symlink Gerd Hoffmann
2020-08-25 6:20 ` Gerd Hoffmann [this message]
2020-08-25 6:20 ` [PULL 3/3] meson: avoid compiling qemu-keymap by default Gerd Hoffmann
2020-08-25 12:59 ` [PULL 0/3] Fixes 20200825 patches Peter Maydell
2020-08-27 7:20 ` Thomas Huth
2020-08-27 9:28 ` Gerd Hoffmann
2020-08-27 10:23 ` Peter Maydell
2020-08-28 5:13 ` Gerd Hoffmann
2020-08-28 16:29 ` Peter Maydell
2020-08-28 16:40 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200825062008.6502-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.