From nobody Sun May 5 16:28:25 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=1605644704; cv=none; d=zohomail.com; s=zohoarc; b=Eq/rAWDzsIM8+g8QAlMGFOTJ0l9JVdTXdeJTeFZRnUiqBDl/2wObrQy49pgSJDhsQTYiM6B1u0a//p/18dJDWFeCM6VZFKBAPc2O9nu4lUczDIZEkfYBLwAEXQpmx+oQ9F4TGkU/IjbzKFX9W1f3jhVzEGhiHHuLxr2uvtIhAak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605644704; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ycXSvlpW7WrvkmrpqjzQJmRyl/xMuhCLffjtjsuWkoY=; b=SR78c2c6NwMPb7YCDN3RWiS00lvQEx6pM3Vn0bKijz/7f+bUn6fBkokY68XDUL30dhwAFLSHY6I6IFJVDswKFGSngkPq05fnrwQRnVzYPUlo3swjJ0OzTFEhU0+4gIQgYkfQpVi1NACmOJkJSvbGItHxe8UF2S9zAXS15bHT9NI= 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 1605644704167102.7209692159206; Tue, 17 Nov 2020 12:25:04 -0800 (PST) Received: from localhost ([::1]:58504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf7XC-0003Ej-Ho for importer@patchew.org; Tue, 17 Nov 2020 15:25:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf7Rt-0000K9-DU for qemu-devel@nongnu.org; Tue, 17 Nov 2020 15:19:33 -0500 Received: from mail.weilnetz.de ([37.120.169.71]:51036 helo=v2201612906741603.powersrv.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf7Rr-000639-4D for qemu-devel@nongnu.org; Tue, 17 Nov 2020 15:19:32 -0500 Received: from localhost (localhost [127.0.0.1]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id 8F96DDA15EB; Tue, 17 Nov 2020 21:19:28 +0100 (CET) Received: from v2201612906741603.powersrv.de ([127.0.0.1]) by localhost (v2201612906741603.powersrv.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C_1VE8Lih6xw; Tue, 17 Nov 2020 21:18:42 +0100 (CET) Received: from qemu.weilnetz.de (qemu.weilnetz.de [188.68.58.204]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id 792FADA061C; Tue, 17 Nov 2020 21:18:42 +0100 (CET) Received: by qemu.weilnetz.de (Postfix, from userid 1000) id 370EE460019; Tue, 17 Nov 2020 21:18:42 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at v2201612906741603.powersrv.de From: Stefan Weil To: qemu-devel@nongnu.org, Paolo Bonzini , Michael Roth Subject: [PATCH for-5.2] meson: Fix build with --disable-guest-agent-msi Date: Tue, 17 Nov 2020 21:18:34 +0100 Message-Id: <20201117201834.408892-1-sw@weilnetz.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 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=37.120.169.71; envelope-from=stefan@weilnetz.de; helo=v2201612906741603.powersrv.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 14:07:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, 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: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The QGA MSI target requires several macros which are only available without --disable-guest-agent-msi. Don't define that target if configure was called with --disable-guest-agent= -msi. Signed-off-by: Stefan Weil --- qga/meson.build | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/qga/meson.build b/qga/meson.build index 53ba6de5f8..520af6ce9b 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -61,23 +61,25 @@ if targetos =3D=3D 'windows' if 'CONFIG_QGA_VSS' in config_host and 'QEMU_GA_MSI_WITH_VSS' in confi= g_host deps +=3D qga_vss endif - qga_msi =3D custom_target('QGA MSI', - input: files('installer/qemu-ga.wxs'), - output: 'qemu-ga-@0@.msi'.format(config_host['= ARCH']), - depends: deps, - command: [ - find_program('env'), - 'QEMU_GA_VERSION=3D' + config_host['QEMU_GA_= VERSION'], - 'QEMU_GA_MANUFACTURER=3D' + config_host['QEM= U_GA_MANUFACTURER'], - 'QEMU_GA_DISTRO=3D' + config_host['QEMU_GA_D= ISTRO'], - 'BUILD_DIR=3D' + meson.build_root(), - wixl, '-o', '@OUTPUT0@', '@INPUT0@', - config_host['QEMU_GA_MSI_ARCH'].split(), - config_host['QEMU_GA_MSI_WITH_VSS'].split(), - config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].sp= lit(), - ]) - all_qga +=3D [qga_msi] - alias_target('msi', qga_msi) + if 'CONFIG_QGA_MSI' in config_host + qga_msi =3D custom_target('QGA MSI', + input: files('installer/qemu-ga.wxs'), + output: 'qemu-ga-@0@.msi'.format(config_host= ['ARCH']), + depends: deps, + command: [ + find_program('env'), + 'QEMU_GA_VERSION=3D' + config_host['QEMU_G= A_VERSION'], + 'QEMU_GA_MANUFACTURER=3D' + config_host['Q= EMU_GA_MANUFACTURER'], + 'QEMU_GA_DISTRO=3D' + config_host['QEMU_GA= _DISTRO'], + 'BUILD_DIR=3D' + meson.build_root(), + wixl, '-o', '@OUTPUT0@', '@INPUT0@', + config_host['QEMU_GA_MSI_ARCH'].split(), + config_host['QEMU_GA_MSI_WITH_VSS'].split(= ), + config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].= split(), + ]) + all_qga +=3D [qga_msi] + alias_target('msi', qga_msi) + endif endif else install_subdir('run', install_dir: get_option('localstatedir')) --=20 2.29.2