From nobody Sat May 18 20:37:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598336604; cv=none; d=zohomail.com; s=zohoarc; b=dcAOEkmmchqMaWqMaLCWFQEAX/XzjfLjybj9FprU1R3vKxMoDIYPU73S5uWONJ32A/o3OebM7KEfW6MyTdTVcWdLLz3MZlifvw73JbaSBo9wlwL0jcG9odPT0nRA8i51v8h0MdwzokMuDhOV4RHFqFp3y/J36xbOUshLzcaiwDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598336604; h=Content-Type: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=TcRbvyTzoBYYcoZF7ye/vje8bN4fWyq6/fM1cwgfk4g=; b=oCTJM27UYGUceIImzats01aqBrDjy2r5xyXyUkgvSyDgaAp1QmwNm06x29II+vWyjoSW/eDNkmXNmnn2VNJvXXKZ06FE0YTDizg05SxnClptOUnA3Ja2FSP3le5YQ0rgfxDnOkwU/vac8fCO0XeYoWBlHCqr4WI3Lc6XcAHfLMQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598336604200511.49418147727295; Mon, 24 Aug 2020 23:23:24 -0700 (PDT) Received: from localhost ([::1]:45722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kASMc-0005Sc-Od for importer@patchew.org; Tue, 25 Aug 2020 02:23:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kASJj-0002Mr-Ps for qemu-devel@nongnu.org; Tue, 25 Aug 2020 02:20:23 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34567 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kASJi-0002bU-9g for qemu-devel@nongnu.org; Tue, 25 Aug 2020 02:20:23 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-330-SnfA8RjtO1u7LyMrL3adCA-1; Tue, 25 Aug 2020 02:20:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A67DA425D3; Tue, 25 Aug 2020 06:20:12 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37EB32AABF; Tue, 25 Aug 2020 06:20:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 56CBB241; Tue, 25 Aug 2020 08:20:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598336421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TcRbvyTzoBYYcoZF7ye/vje8bN4fWyq6/fM1cwgfk4g=; b=RByqy6ebSwWbyDuLROdtwiiwUjSYd2uys35ow6Nw5yxo7/iehREU27Yh3jD7z4NMPCfiD8 ovMToMnVE2OLOu0BPUavEY4aDg5izb5wEet+1gj7Rl+eHeBrUzIp76F5KxXViqVLy+xGTF CmtXVOBSKFM0hlkVPrn/srRY9T3R9Ao= X-MC-Unique: SnfA8RjtO1u7LyMrL3adCA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/3] meson: drop keymaps symlink Date: Tue, 25 Aug 2020 08:20:06 +0200 Message-Id: <20200825062008.6502-2-kraxel@redhat.com> In-Reply-To: <20200825062008.6502-1-kraxel@redhat.com> References: <20200825062008.6502-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Klaus Jensen , Bin Meng , Alistair Francis , laurent@vivier.eu, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We are building the keymaps by default now. Drop the keymaps symlink so the generated files are actually written to the build tree not the source tree. Signed-off-by: Gerd Hoffmann Reviewed-by: Alistair Francis Tested-by: Klaus Jensen Tested-by: Bin Meng Message-id: 20200824074057.3673-1-kraxel@redhat.com --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b8f5b81a6719..377aafa2acd5 100755 --- a/configure +++ b/configure @@ -8120,7 +8120,7 @@ DIRS=3D"$DIRS roms/seabios" LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/lm32/Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" -LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" +LINKS=3D"$LINKS pc-bios/optionrom/Makefile" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" LINKS=3D"$LINKS roms/seabios/Makefile" LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" --=20 2.27.0 From nobody Sat May 18 20:37:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598336519; cv=none; d=zohomail.com; s=zohoarc; b=DlVITFml+SMYLrRrQ5M9pqdbfd5E8jZpcQv1R0NcKX6BAf70ETHFAOu+ubL7rHrxfQf8/F8fH6I1DXnA4fhMtWo9nmTs78pEBm16llxYTewlejo2qXQezMWJUJZSpZWZPN3qqEmng517C3dmu8PCeXfY9txhmJ10GxAtRvZWcQc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598336519; h=Content-Type: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=dGTPTmoPKzRsP17keVIz+Uz5RFhbByT3EmOjh1h6epY=; b=O/ywuBRcZlp4NDnCgOOwh2k/CLKaFwlE8P4VSCWuAsEPSPItsNq954nylDIaWpKgKfnIbMTq0L3k42WqHUxt3DV9iqZ5oFR65+LJNAq99CU1Mr7WUVGfTzubkMoEos+uAVmzNzAYIw+pW44gRESdxv2bl3B8hvA8WgkEEv4gwhQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598336519922231.4615040498195; Mon, 24 Aug 2020 23:21:59 -0700 (PDT) Received: from localhost ([::1]:41414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kASLG-0003gP-2m for importer@patchew.org; Tue, 25 Aug 2020 02:21:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kASJh-0002MP-TZ for qemu-devel@nongnu.org; Tue, 25 Aug 2020 02:20:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kASJf-0002a1-Au for qemu-devel@nongnu.org; Tue, 25 Aug 2020 02:20:21 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-502-lIgeAlI6N5erxNIQp4LmEg-1; Tue, 25 Aug 2020 02:20:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99B2180EDA3; Tue, 25 Aug 2020 06:20:12 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48C7F6FDBB; Tue, 25 Aug 2020 06:20:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 645979A8F; Tue, 25 Aug 2020 08:20:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598336417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dGTPTmoPKzRsP17keVIz+Uz5RFhbByT3EmOjh1h6epY=; b=Vtk02l45SE2Mc1G9LHZKrVMshEEX+/OiMbgWRGGY8PYnL6AdOhXh74iYf29dfEFsYz51bd BQ1sRwp+FYZ/NQwfOVLRM25qWpgd9s0+0JSV9HUR9NhEQms+O5YRO7pC46gvX4+UjgUI6C LdVTbH9htR+3bMfcfQF8Wrl7CjA/Uu4= X-MC-Unique: lIgeAlI6N5erxNIQp4LmEg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/3] meson: move xkbcommon to meson Date: Tue, 25 Aug 2020 08:20:07 +0200 Message-Id: <20200825062008.6502-3-kraxel@redhat.com> In-Reply-To: <20200825062008.6502-1-kraxel@redhat.com> References: <20200825062008.6502-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: laurent@vivier.eu, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Laurent Vivier Signed-off-by: Laurent Vivier Message-id: 20200824152430.1844159-2-laurent@vivier.eu Signed-off-by: Gerd Hoffmann --- 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=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 @@ -8251,7 +8230,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_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 =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/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.27.0 From nobody Sat May 18 20:37:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598336519; cv=none; d=zohomail.com; s=zohoarc; b=d1vnlutYL80Pm77huPa5T2f4UQXEMgP/bl3tAeOwwI8wu/KCpCS3kt/i6vT0tRfRmPZl+maAEwplcLzgL3/hOkLBx0SXN5jERgw3KQlvnkpCXQ3DhLlFcxrR+pSE7TD3hnxypOl0281uDeGc0TUMoOalzDht/DDw0STj/O48ArQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598336519; h=Content-Type: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=4F/YMybIDUdjbc//qb2Izw6T49U8OMYW+R/Ovl2R8ak=; b=YG+fWP9iTR9f4rCz9jKPs/sj39dULiTJ+BRjWvUQSOX5Fa31Lf6prvc/IPrmqTadjFz5xFN2yDJcNv33ShZk/8ommsByH7V1tCl3ZIttNmf4hWPqPzNr22z5BvyjZ1NLL1eQQt06Aa+gpkcyZEpr/RoY2tSH4Wsw6Tq9gvk29EQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598336519780333.2049067900849; Mon, 24 Aug 2020 23:21:59 -0700 (PDT) Received: from localhost ([::1]:41434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kASLG-0003go-02 for importer@patchew.org; Tue, 25 Aug 2020 02:21:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kASJh-0002MO-RW for qemu-devel@nongnu.org; Tue, 25 Aug 2020 02:20:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54906 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kASJe-0002Zx-NO for qemu-devel@nongnu.org; Tue, 25 Aug 2020 02:20:21 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-302-7V47y0aBOcGC64o3yJH51A-1; Tue, 25 Aug 2020 02:20:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5803318B9EC9; Tue, 25 Aug 2020 06:20:12 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48CF5709BC; Tue, 25 Aug 2020 06:20:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6CBDE9A92; Tue, 25 Aug 2020 08:20:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598336417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4F/YMybIDUdjbc//qb2Izw6T49U8OMYW+R/Ovl2R8ak=; b=aSNVsmslkx1mRKVh4H4JLkjbAi8gC/+hTO2wf+C7R3jnBn6axeugnqNmzAOXELTOImdb9L oIIJ8ji6jZIzf1m08QGcNJ5aD+J/VpDQQM4wtphj+xHoYABurJ6W3YQ3OMI0vShVOtRRkS NW7Q56n153k5e+CYNiq2w0Ui9a5wLSQ= X-MC-Unique: 7V47y0aBOcGC64o3yJH51A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/3] meson: avoid compiling qemu-keymap by default Date: Tue, 25 Aug 2020 08:20:08 +0200 Message-Id: <20200825062008.6502-4-kraxel@redhat.com> In-Reply-To: <20200825062008.6502-1-kraxel@redhat.com> References: <20200825062008.6502-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 02:05:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: laurent@vivier.eu, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Laurent Vivier 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 Message-id: 20200824152430.1844159-3-laurent@vivier.eu Signed-off-by: Gerd Hoffmann --- 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.27.0