From nobody Sun May 19 00:47:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1598282807; cv=none; d=zohomail.com; s=zohoarc; b=VfxLU4f+Ky+YL2NUadsvwip3bemT5jk7mtm1uEnpkeocX1kNDpKqy9FE5A3SXpI9DYZPU45lhAs4r1/UfGJEz3Hq8wAvGF/oV2nlJa6GUOCmi4BjZky4GSRNAu161+lRhKKwtzcw4nWOxIwBXOsEnNDMCIiAaG295P3+WYZLINM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598282807; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QpZuSML7KiFwDxQqVeG4HQAzvebQ9Q3cuJ890SUxsg8=; b=gDc4paGdpEPHnLm4bHtKJaMrfOsbfNdeVAosk6ZQ1iiOQ3oHuWS5FFVKIysOjOm1/CuLahuyC+tju8bSexdzYpiiPq0EEpRQ2Nl0g2XJ/B+ociyVkBtYsMNqDULmNlKD1UWftBMi1G+tIuCfzV7gQLgnkZ9Nyn0PKv5oMy/iQ3M= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598282807053947.4224005337078; Mon, 24 Aug 2020 08:26:47 -0700 (PDT) Received: from localhost ([::1]:50214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAEMv-0007Dh-Or for importer@patchew.org; Mon, 24 Aug 2020 11:26:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAEKw-0004T6-VX for qemu-devel@nongnu.org; Mon, 24 Aug 2020 11:24:42 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:47905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAEKu-0003e6-O2 for qemu-devel@nongnu.org; Mon, 24 Aug 2020 11:24:42 -0400 Received: from localhost.localdomain ([82.252.135.186]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mi2eP-1knOdP1DI9-00e58E; Mon, 24 Aug 2020 17:24:34 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] meson: move xkbcommon to meson Date: Mon, 24 Aug 2020 17:24:29 +0200 Message-Id: <20200824152430.1844159-2-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200824152430.1844159-1-laurent@vivier.eu> References: <20200824152430.1844159-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:k5i2OgnE//VPoIRxpa/RiHE+HJcOnXWLM2V8QV9O/H9eCeCq75q 0QQYbRgh7pQVeOAYdZSvrv5b8rVnPMhtevbMWI8bZqWKlL/BRfyK62vtLrwkV2LMmYoxStF BTWkwlqYC24xms893qpScXYDOWubP6AO7AmRJSRbrO158bdomFZghoGkzj5zBe6rVy2wg9O AWUX1psORcmlu6cl7HFMA== X-UI-Out-Filterresults: notjunk:1;V03:K0:vbzckGlfBnY=:vpTigehA1EXSRWy9TJpDR3 dZZm/VjGxTu4BTvIq7d2aZkUzv9ibaaOTZzPoB2bfJGQNWqJabRuK/TlucYKI9A/g7kMCrT2d 69CkxqFyi6ZJab6SQtF/jv5AR/XWM05NupO5XpzBRAB2FhswHIwqxMGBhmVYRphs2ypyCPlCh 6rVLct8vI8Bne2yig3KKzuCxcSfsVzad8Tuvay3WRKLcYmrLw2ut/qyhp4IuD8MXzkoUJ7RuN SWQHt9Uar5fQ+sF7wa+l+zwe3+TjaNJSczR+5wc2Y3jdS/uxmAgfidO9gv5obsaG7yAtWe9b4 fHAZHuX2fojc754w5Il0nrGjBywxMzkiyYh9rigcw0oCDcuNbrX7eHFkHVI2hm/0jeTWFfwZ5 fJ3Gw+8cqoTWTVP8LYjcHLd5mJFVDv/fucuTDbkzij5uY6UfbOyj99FIgSXVqTPXUgMMEjUAu utFXpAH+gbiqwVAp2/5QJFhQdLxUoVCoWtsZsr2S9L4aZmIpFIcgRSfAb3M/K/mLfMGIzlVKk syonLLyMwO1JKSZmjzadg68BEPWiIZGm1ZkagZ9K4kHv94H02ZrexC0m1KcchmUwbUSdORqLd QNHmVd9CCR5RNL+GsFyOSwbFSmHez1LEvFRg4eaCPF3sxkwXAOJWpVXyNLkX1ZpA4gCNmJfqB Etm4qcBl8b8yPXBMNiq8qt1/aZdPxvlayRsd3VQSBkZ+Ac0PNqVLumPRY7pF44nLv8QZqPJgi DJl5eeQBNSf0W6P45nQ8NY7CsH44Skd7AC8WED9DEUTmE24B8Mkp2JBGyz5o3LoKBpc3DxCtW r/j1EuK3S88A7NvIlGzHuk7MgkpXuwkeRy5E4Ei84CtDuQduYq1SyvR+tErRey47uW7ZeML Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/24 11:24:39 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier --- configure | 29 ++++------------------------- meson.build | 11 ++++++----- meson_options.txt | 1 + ui/meson.build | 2 +- 4 files changed, 12 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 67832e3bab76..dcc4bca5e42e 100755 --- a/configure +++ b/configure @@ -432,7 +432,7 @@ vde=3D"" vnc_sasl=3D"auto" vnc_jpeg=3D"auto" vnc_png=3D"auto" -xkbcommon=3D"" +xkbcommon=3D"auto" xen=3D"" xen_ctrl_version=3D"" xen_pci_passthrough=3D"" @@ -1631,9 +1631,9 @@ for opt do ;; --disable-libpmem) libpmem=3Dno ;; - --enable-xkbcommon) xkbcommon=3Dyes + --enable-xkbcommon) xkbcommon=3D"enabled" ;; - --disable-xkbcommon) xkbcommon=3Dno + --disable-xkbcommon) xkbcommon=3D"disabled" ;; --enable-plugins) plugins=3D"yes" ;; @@ -3446,22 +3446,6 @@ EOF fi fi =20 -########################################## -# xkbcommon probe -if test "$xkbcommon" !=3D "no" ; then - if $pkg_config xkbcommon --exists; then - xkbcommon_cflags=3D$($pkg_config xkbcommon --cflags) - xkbcommon_libs=3D$($pkg_config xkbcommon --libs) - xkbcommon=3Dyes - else - if test "$xkbcommon" =3D "yes" ; then - feature_not_found "xkbcommon" "Install libxkbcommon-devel" - fi - xkbcommon=3Dno - fi -fi - - ########################################## # xfsctl() probe, used for file-posix.c if test "$xfs" !=3D "no" ; then @@ -6827,11 +6811,6 @@ if test "$audio_win_int" =3D "yes" ; then fi echo "CONFIG_BDRV_RW_WHITELIST=3D$block_drv_rw_whitelist" >> $config_host_= mak echo "CONFIG_BDRV_RO_WHITELIST=3D$block_drv_ro_whitelist" >> $config_host_= mak -if test "$xkbcommon" =3D "yes" ; then - echo "CONFIG_XKBCOMMON=3Dy" >> $config_host_mak - echo "XKBCOMMON_CFLAGS=3D$xkbcommon_cflags" >> $config_host_mak - echo "XKBCOMMON_LIBS=3D$xkbcommon_libs" >> $config_host_mak -fi if test "$xfs" =3D "yes" ; then echo "CONFIG_XFS=3Dy" >> $config_host_mak fi @@ -8250,7 +8229,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_png=3D$v= nc_png \ - -Dgettext=3D$gettext \ + -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/meson.build b/meson.build index df5bf728b57a..f6e346af1a69 100644 --- a/meson.build +++ b/meson.build @@ -152,10 +152,10 @@ libcap_ng =3D not_found if 'CONFIG_LIBCAP_NG' in config_host libcap_ng =3D declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'= ].split()) endif -xkbcommon =3D not_found -if 'CONFIG_XKBCOMMON' in config_host - xkbcommon =3D declare_dependency(compile_args: config_host['XKBCOMMON_CF= LAGS'].split(), - link_args: config_host['XKBCOMMON_LIBS'].= split()) +xkbcommon =3D dependency('xkbcommon', required: get_option('xkbcommon'), s= tatic: enable_static, + include_type: 'system') +if xkbcommon.found() + xkbcommon =3D declare_dependency(dependencies: xkbcommon) endif slirp =3D 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 =20 -if 'CONFIG_XKBCOMMON' in config_host +if xkbcommon.found() # used for the update-keymaps target, so include rules even if !have_too= ls qemu_keymap =3D executable('qemu-keymap', files('qemu-keymap.c', 'ui/inp= ut-keymap.c') + genh, dependencies: [qemuutil, xkbcommon], install: h= ave_tools) 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/ui/meson.build b/ui/meson.build index 81fd393432a4..018c5698bf66 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -95,7 +95,7 @@ keymaps =3D [ ['osx', 'qcode'], ] =20 -if have_system or 'CONFIG_XKBCOMMON' in config_host +if have_system or xkbcommon.found() foreach e : keymaps output =3D 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1]) genh +=3D custom_target(output, --=20 2.26.2 From nobody Sun May 19 00:47:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1598282761; cv=none; d=zohomail.com; s=zohoarc; b=Azb0/Ros87xCVAsPL+eGWPvKf0ODf4b/voPbSq+hUTH3YFT4B1g79mmUbvyUZ6LGZl8nPOHfzj0MxGc21lDiRGw9ShKnlY5JRldVWVHEICRsqN6j84etgQRBOWXGSgjRGJzlOuBzozSFLplzZsCY0rz+I7KOUWjQaszyXhMJmnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598282761; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xo/0y8O7jRHYS8Zmys+JBE06zUTIE4b958tTJINxGFo=; b=fVP3ucY0NQLoGcMrwwJsVWfC76GqIu3TUMPPuR4a1tbkOtefEdF7vLbiGdCykFxDIqi8/YAMLkubJL+CADDh3IrtdAioABIw1yYtJ+61vGV2tE5yVLdPY46JyW2rWVr1xCN1j8XoDGoulPjvuvdb5F5xg2yzyGy9k1n4CNN3c00= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598282761821660.996030203388; Mon, 24 Aug 2020 08:26:01 -0700 (PDT) Received: from localhost ([::1]:47336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAEMC-00062Q-Eb for importer@patchew.org; Mon, 24 Aug 2020 11:26:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAEKx-0004UY-Kk for qemu-devel@nongnu.org; Mon, 24 Aug 2020 11:24:43 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:36437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAEKv-0003e8-6B for qemu-devel@nongnu.org; Mon, 24 Aug 2020 11:24:43 -0400 Received: from localhost.localdomain ([82.252.135.186]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MWitM-1k7yDj2z2O-00X2gF; Mon, 24 Aug 2020 17:24:35 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] meson: avoid compiling qemu-keymap by default Date: Mon, 24 Aug 2020 17:24:30 +0200 Message-Id: <20200824152430.1844159-3-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200824152430.1844159-1-laurent@vivier.eu> References: <20200824152430.1844159-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:w0PNymbRYVT/DGV+LFxT2+L1XvNtUGU7gd1rfc07X8J9DTZ4rmf KFcYmcQkUfQYj3CnqBRqePuK5M793Z818M/blggJ9vTZ7c03q3aGlugoADooZswl9MBx1wo VuifzAyd6CPGl6LcqQuAHAmtSzXBnu5EtUTM089hIBs1ghT5RAkOGCzmlLgKXff41lEeXwz aFEySU3aQK182wqToUjYA== X-UI-Out-Filterresults: notjunk:1;V03:K0:Oz3VMNszdZg=:zM7gCogZyZ/wtsSOOnEQtm oFDHB2G2M0azhaEjac8IB0XLJL/Yr2kpS0Q7bTnjlLPZTrAHfU3JbWmtkD1A6cZDvSTWKTLGE MdRQpoqtzbgPfg80vgtGcQ6LyCdUFNouD89fzdaBI9Cdwi/oYnIVN81wAos+QGSym/gQrXxfT 3Ar5g+XO75tz3JxJZXQIhXuG8SrlfCE656whA76I3diAbVWoSYc3r5E7JXz/SASb54FyV9Rhl UIQY1EHWmrMMeHAejmjuOOsEpOb7qhd5STNJzPwH+eyNF5Qholw8Acm6jEWahfg8xe9hfjIZh RwJm/6Jcgyxv6mXb+jOx+BCoL+F4nL6x1Uf6I627JioS4RfQi++et5LsqfYwfhL+LY9zDtIKz ZE9cj1AlEl7BKfGoBKZ/tqYTcQ+uBU5qx47MtMSUbk45FZynaLzGNDRxK2c7DV6nl3abStdNT BjSryMT5bU8tcOHbD0rhl0xL5XZ6N3rz4usxtON00FG8sL6gIZ+YmxNcmhtraprBJKMnr+kk+ HxahicIz4PGy2z2qqunSIMxqBOXdzZrvL66avUgeeiDLU2C60Nz5x+Rb4bexcsyTL9XkpGas2 3sW8Zeku21n7Yzbn+qQpDit6qwgZE0aSH2tjqoelUud5bcqCTmr7P1mnwGyA84LBrMlr0Imbp wttHdNjhpdFO1CBj0WiWj750VEDovFKE1bIDKXTmF5RORm8VtUBuijdQJh0giCO1Ff2Hjv7i6 0vVyVyq9jfw4KtJea4yWDbqB00Cc+0Elr+lDscoOZfmyNKtV7fOwlq5fLc1okxjU+HlQ39o1s UEdIbGfQJiV/JtCakdie0qxV5H/HFtB6/91v1nsWaKcGBRqa1w71BlEtfwEJqnSRulrplfn Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/24 11:24:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" qemu-keymap is not needed with linux-user, so disable it by default if tools and system are disabled (tools are disabled by default with linux-use= r). Avoid this error with statically linked binaries: Linking target qemu-keymap /usr/bin/ld: cannot find -lxkbcommon Signed-off-by: Laurent Vivier --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meson.build b/meson.build index f6e346af1a69..f0fe5f8799e0 100644 --- a/meson.build +++ b/meson.build @@ -1063,6 +1063,11 @@ if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif =20 +# Don't build qemu-keymap if xkbcommon is not explicitly enabled +# when we don't build tools or system +if get_option('xkbcommon').auto() and not have_system and not have_tools + xkbcommon =3D not_found +endif if xkbcommon.found() # used for the update-keymaps target, so include rules even if !have_too= ls qemu_keymap =3D executable('qemu-keymap', files('qemu-keymap.c', 'ui/inp= ut-keymap.c') + genh, --=20 2.26.2