From nobody Mon Feb 9 06:01:59 2026 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