From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CDABC433EF for ; Thu, 28 Apr 2022 07:39:48 +0000 (UTC) Received: from localhost ([::1]:53818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyke-0001Fk-00 for qemu-devel@archiver.kernel.org; Thu, 28 Apr 2022 03:39:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy25-0000Gn-Il for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:45 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:37869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy23-00055k-QX for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:45 -0400 Received: by mail-ed1-x530.google.com with SMTP id k27so4398424edk.4 for ; Wed, 27 Apr 2022 23:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=875vs54jSlHP1j/ag97c6ycrMEKN/NuuwrYXpt6BYgw=; b=ibgaYLeJDbS8WXeKPO6usa+B9CgYOqH012zljD7g7K9U51mLYkSYOMkizbXZB8Mn6F jwuOP5RmOAUouLOfKgUOmuH5sDi/ojnECje8CzxMxaVtml5VFcxKggjgFj1nsD3BNSIF 0K0CxIxKftbAomFsbx4uDIow0wpq6fNHxGEEEsJSD1G5oFt3jt7pXveXzPaRtcYi/a+K XpFKBCZJOFcL7vzeYgnwGazg6SnFMhYPbb1EJemACT55WCbnVZmmFkQ8ODBa23UC+dUz gb4AvPiHQWowJ5SxE3uZNbvzTnYL13Tubl7TjDXnauV0/UWDH/2t4v2ARk4VGm0HDp0D 76hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=875vs54jSlHP1j/ag97c6ycrMEKN/NuuwrYXpt6BYgw=; b=yycczkSTLSe9z380HAMZgMy/cKkwIBpXtZJX3uWBjoc+PdvR9F0uJ7wtE87GCIsvEJ Z93ai/4FZG/i+/80dRVxogUKWejGG6pn8FNduEu0OEmCohlFKwLFmOUqUGQubxiQZo4X 0B4FBtVS1mFXBR2kItenifN9CnReGCRew2QnA+TSmQsEV34WOcpD58Js3IjnGOfDOkbN 7pgJUNg0PnTro0UfkRt0tkXo2LdxFmf1LDFPyDMUrMJqdHR0ALPmVCjgHooSVI6sq49d LvdWT4zp1ntwFhyRJMSi6ALxLBYE2iB1Vzwnt2cOPkkt0CmRFF2AQFJx4r/O9Paa0MLV K/Ng== X-Gm-Message-State: AOAM531lUfs7P2848aEQVQkFQGayfWe6KA/qyFY97MD8PsQU0LYb2ggS 8SWrLhRvDEJSbKny9T0x5IWHrbbP79FY2A== X-Google-Smtp-Source: ABdhPJx9qnOXfWVxodfMEYHABXai4qoaEak0aBWL2+tqknadB0N1S1R/bulq7vD9cmChRMb8UkbUgg== X-Received: by 2002:a50:d4d0:0:b0:425:f894:7a73 with SMTP id e16-20020a50d4d0000000b00425f8947a73mr14230220edj.245.1651128822429; Wed, 27 Apr 2022 23:53:42 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/18] qga: wixl: get path to sysroot from pkg-config as intended Date: Thu, 28 Apr 2022 08:53:24 +0200 Message-Id: <20220428065335.189795-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The .wxs file uses $(var.Mingw_bin) while configure/meson have always used Mingw_dlls. Fix them to match what was probably intended. Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- configure | 4 ++-- qga/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 9e32c96fce..049f669a94 100755 --- a/configure +++ b/configure @@ -2702,7 +2702,7 @@ if test "$QEMU_GA_VERSION" = ""; then QEMU_GA_VERSION=$(cat $source_path/VERSION) fi -QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config --variable=prefix glib-2.0)/bin" +QEMU_GA_MSI_MINGW_BIN_PATH="$($pkg_config --variable=prefix glib-2.0)/bin" # Mac OS X ships with a broken assembler roms= @@ -2790,7 +2790,7 @@ if test "$debug_tcg" = "yes" ; then fi if test "$mingw32" = "yes" ; then echo "CONFIG_WIN32=y" >> $config_host_mak - echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $config_host_mak + echo "QEMU_GA_MSI_MINGW_BIN_PATH=${QEMU_GA_MSI_MINGW_BIN_PATH}" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak diff --git a/qga/meson.build b/qga/meson.build index 392d560941..6d9f39bb32 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -129,7 +129,7 @@ if targetos == 'windows' wixl, '-o', '@OUTPUT0@', '@INPUT0@', qemu_ga_msi_arch[cpu], qemu_ga_msi_vss, - '-D', 'Mingw_dlls=' + config_host['QEMU_GA_MSI_MINGW_DLL_PATH'], + '-D', 'Mingw_bin=' + config_host['QEMU_GA_MSI_MINGW_BIN_PATH'], ]) all_qga += [qga_msi] alias_target('msi', qga_msi) -- 2.35.1