From nobody Sat May 18 21:16:07 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; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1670944435; cv=none; d=zohomail.com; s=zohoarc; b=gjG683Dci0PoJmX3bJg3rGxw4aCLT1AkEN00FzK/ZLvMc76gZxZa8nTPtOmebFfTHBHv4/PC1T0D8W8PedwAVfteoE5/u3rjetI7xV/YJ9SczwgbvbLAa5RKnw97FK173dFmvZcfwPhAAi9TkJg5FunLaNuBkhUHsuKElfqNoAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670944435; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=3CO7YITEXGeVhhoL9L3fXLIE2+rM/MuzpaLYLciu1Xs=; b=UstTEbVL2lplew1D6qjYrCyykb0FF8RpzgllcbNmQd9TtvNKXRSJwI1AWEhImSprEs49BtPoR/JRsANsAwMESdNAhfo8jqdd3PNbjDLNDbgdi9mZ3+ffN0BmvHmyWOzZEHA0e1o1JAp6ytz6Lt2uqiL7bChhFmg5ffqSp4ocsw0= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670944435620222.23445160142148; Tue, 13 Dec 2022 07:13:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p56yG-0000QW-Mv; Tue, 13 Dec 2022 10:13:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p56yF-0000Q6-7C; Tue, 13 Dec 2022 10:13:27 -0500 Received: from relay.virtuozzo.com ([130.117.225.111]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p56yD-0002vQ-5D; Tue, 13 Dec 2022 10:13:26 -0500 Received: from [192.168.16.151] (helo=roughy.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1p56xU-00Ewjh-KY; Tue, 13 Dec 2022 16:12:40 +0100 To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, andrey.drobyshev@virtuozzo.com, den@virtuozzo.com, kkostiuk@redhat.com, sw@weilnetz.de Subject: [PATCH v2] qga-win: choose the right libpcre version to include in MSI package Date: Tue, 13 Dec 2022 17:13:43 +0200 Message-Id: <20221213151343.90235-1-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.38.1 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=130.117.225.111; envelope-from=andrey.drobyshev@virtuozzo.com; helo=relay.virtuozzo.com 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Andrey Drobyshev From: Andrey Drobyshev via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1670944436812100003 Content-Type: text/plain; charset="utf-8" According to GLib changelog [1], since version 2.73.2 GLib is using libpcre2 instead of libpcre. As a result, qemu-ga MSI installation fails due to missing DLL when linked with the newer GLib. This commit makes wixl to put the right libpcre version into the MSI bundle: either libpcre-1.dll or libpcre2-8-0.dll, depending on the present version of GLib. [1] https://gitlab.gnome.org/GNOME/glib/-/releases#2.73.2 Previous version: https://lists.nongnu.org/archive/html/qemu-trivial/2022-11/msg00237.html Signed-off-by: Andrey Drobyshev Reviewed-by: Konstantin Kostiuk Tested-by: Konstantin Kostiuk --- qga/installer/qemu-ga.wxs | 12 +++++++++--- qga/meson.build | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index e344c38e74..9f0bacae81 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -101,9 +101,15 @@ - - - + + + + + + + + + diff --git a/qga/meson.build b/qga/meson.build index 1ff159edc1..ad17dc7dca 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -140,6 +140,11 @@ if targetos =3D=3D 'windows' qemu_ga_msi_vss =3D ['-D', 'InstallVss'] deps +=3D qga_vss endif + if glib.version() < '2.73.2' + libpcre =3D 'libpcre1' + else + libpcre =3D 'libpcre2' + endif qga_msi =3D custom_target('QGA MSI', input: files('installer/qemu-ga.wxs'), output: 'qemu-ga-@0@.msi'.format(host_arch), @@ -153,6 +158,7 @@ if targetos =3D=3D 'windows' '-D', 'QEMU_GA_VERSION=3D' + config_host['QE= MU_GA_VERSION'], '-D', 'QEMU_GA_MANUFACTURER=3D' + config_hos= t['QEMU_GA_MANUFACTURER'], '-D', 'QEMU_GA_DISTRO=3D' + config_host['QEM= U_GA_DISTRO'], + '-D', 'LIBPCRE=3D' + libpcre, ]) all_qga +=3D [qga_msi] alias_target('msi', qga_msi) --=20 2.34.3