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 41077C433EF for ; Tue, 8 Feb 2022 11:47:23 +0000 (UTC) Received: from localhost ([::1]:56362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHOxu-0005jc-4a for qemu-devel@archiver.kernel.org; Tue, 08 Feb 2022 06:47:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHOSX-0001FK-AY for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:14:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:47802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHOSV-00069v-JU for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:14:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644318894; 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: in-reply-to:in-reply-to:references:references; bh=XfgDReLZbAyRLhc/2gmn6lTs46EQjf1QJrRoFOyn2Ks=; b=CjNWwgWZ73vkuePqCC0PaLnfi8Ar2i9Aj5wFwVcrzpfumu4QJBGJeIEhO2Puwv79QMvfmv RlGCrWNHfIt41l8k1gxHB7Zzu0A3I+su2v4BRboyi3lMO26xzfbxseIV3ATBkzjuErM9OY wpPcLQ8qA6LkwQdh9YXsyIfDRqQltII= Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-571-kUALP18tOqC9bazhlz0T_A-1; Tue, 08 Feb 2022 06:14:53 -0500 X-MC-Unique: kUALP18tOqC9bazhlz0T_A-1 Received: by mail-yb1-f199.google.com with SMTP id 127-20020a250f85000000b00611ab6484abso34571531ybp.23 for ; Tue, 08 Feb 2022 03:14:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XfgDReLZbAyRLhc/2gmn6lTs46EQjf1QJrRoFOyn2Ks=; b=ScCyGCsBR3T9sGYrj6BHJXMgzIkwYqbfgeQID0X4ir77/i04R0TGwEsyM8zqkIzbHP dRf23S65reeIIHvqF22qMaTFZuu8vMsNLqM4o6Z0nRdBW1ang7Gbk+9reGOqGPDmwlP8 qp8CSDDW3gH8TdLBnARCH7UFLPeywA4iProf8WSo2nH9YgCGoKhr9vxVPIlVBx/bcozC 4hE/DJjG4rTEdOXfG2eyAp8GhXwr1d+TPzqAvJRt+YbBbjIxpX1QuuTgPNEAs2lT07gO GKAem2aQBA+7SFuEKw+cIkcDKIPdI8RoOClV3tOrqRVZBOEiUs6CiicN7OBxJLHNo/9Y 5uUA== X-Gm-Message-State: AOAM530WDsB2q3o3NTFwvZHGBI1MvBpGBNNpTz57zbgFenAF/ybQ6OZN 4ojsMa41FWdALFLlmEQDFj5DPytAhkpa/uAfE5QaV88I8V0DGE0FqcY6dN4ih8BSa7lTj2eGMk5 kHYsLUjsug9jrLABqSjO4T5p7IDYSLI8= X-Received: by 2002:a81:e445:: with SMTP id t5mr4193210ywl.481.1644318892717; Tue, 08 Feb 2022 03:14:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZVEwu+hF57bKtpYmOAa5FVSlHEXIyfMd7+GOX7xzLX30HFj51y5hgfDylYXH8yXaKptmhuIumTTN4h1dArIA= X-Received: by 2002:a81:e445:: with SMTP id t5mr4193140ywl.481.1644318891525; Tue, 08 Feb 2022 03:14:51 -0800 (PST) MIME-Version: 1.0 References: <20220203173359.292068-1-pbonzini@redhat.com> <20220203173359.292068-24-pbonzini@redhat.com> In-Reply-To: <20220203173359.292068-24-pbonzini@redhat.com> From: Konstantin Kostiuk Date: Tue, 8 Feb 2022 13:14:40 +0200 Message-ID: Subject: Re: [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence To: Paolo Bonzini Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kkostiuk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="0000000000006d5c5e05d77fd398" Received-SPF: pass client-ip=170.10.129.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000006d5c5e05d77fd398 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Konstantin Kostiuk On Thu, Feb 3, 2022 at 8:14 PM Paolo Bonzini wrote: > From: Marc-Andr=C3=A9 Lureau > > C++ presence is checked by the qga/ directory, so it can be assumed > when building VSS module. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > Signed-off-by: Paolo Bonzini > --- > qga/vss-win32/meson.build | 41 +++++++++++++++++++++++---------------- > 1 file changed, 24 insertions(+), 17 deletions(-) > > diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build > index 8f3aff5fe3..8d4c5708d8 100644 > --- a/qga/vss-win32/meson.build > +++ b/qga/vss-win32/meson.build > @@ -1,22 +1,29 @@ > -if add_languages('cpp', required: false) > - glib_dynamic =3D dependency('glib-2.0', static: false) > - link_args =3D cc.get_supported_link_arguments(['-fstack-protector-all'= , > '-fstack-protector-strong', > - '-Wl,--add-stdcall-alias'= , > '-Wl,--enable-stdcall-fixup']) > +glib_dynamic =3D dependency('glib-2.0', static: false) > +link_args =3D cc.get_supported_link_arguments([ > + '-fstack-protector-all', > + '-fstack-protector-strong', > + '-Wl,--add-stdcall-alias', > + '-Wl,--enable-stdcall-fixup' > +]) > > - qga_vss =3D shared_module('qga-vss', ['requester.cpp', 'provider.cpp', > 'install.cpp'], > - name_prefix: '', > - cpp_args: ['-Wno-unknown-pragmas', > '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'], > - link_args: link_args, > - vs_module_defs: 'qga-vss.def', > - dependencies: [glib_dynamic, socket, > - cc.find_library('ole32'), > - cc.find_library('oleaut32'), > - cc.find_library('shlwapi'), > - cc.find_library('uuid'), > - cc.find_library('intl')]) > +qga_vss =3D shared_module( > + 'qga-vss', > + ['requester.cpp', 'provider.cpp', 'install.cpp'], > + name_prefix: '', > + cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', > '-Wno-non-virtual-dtor'], > + link_args: link_args, > + vs_module_defs: 'qga-vss.def', > + dependencies: [ > + glib_dynamic, socket, > + cc.find_library('ole32'), > + cc.find_library('oleaut32'), > + cc.find_library('shlwapi'), > + cc.find_library('uuid'), > + cc.find_library('intl') > + ] > +) > > - all_qga +=3D qga_vss > -endif > +all_qga +=3D qga_vss > > midl =3D find_program('midl', required: false) > widl =3D find_program('widl', required: false) > -- > 2.34.1 > > > > --0000000000006d5c5e05d77fd398 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, Feb 3, 2022 at 8:14 P= M Paolo Bonzini <pbonzini@redhat.= com> wrote:
From: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>

C++ presence is checked by the qga/ directory, so it can be assumed
when building VSS module.

Signed-off-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
=C2=A0qga/vss-win32/meson.build | 41 +++++++++++++++++++++++---------------= -
=C2=A01 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 8f3aff5fe3..8d4c5708d8 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -1,22 +1,29 @@
-if add_languages('cpp', required: false)
-=C2=A0 glib_dynamic =3D dependency('glib-2.0', static: false)
-=C2=A0 link_args =3D cc.get_supported_link_arguments(['-fstack-protect= or-all', '-fstack-protector-strong',
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0'-Wl,--add-stdcall-alias', '-Wl,--enable-st= dcall-fixup'])
+glib_dynamic =3D dependency('glib-2.0', static: false)
+link_args =3D cc.get_supported_link_arguments([
+=C2=A0 '-fstack-protector-all',
+=C2=A0 '-fstack-protector-strong',
+=C2=A0 '-Wl,--add-stdcall-alias',
+=C2=A0 '-Wl,--enable-stdcall-fixup'
+])

-=C2=A0 qga_vss =3D shared_module('qga-vss', ['requester.cpp= 9;, 'provider.cpp', 'install.cpp'],
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 name_prefix: '= ',
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cpp_args: ['-W= no-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-= non-virtual-dtor'],
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 link_args: link_ar= gs,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 vs_module_defs: &#= 39;qga-vss.def',
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dependencies: [gli= b_dynamic, socket,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cc.find_library('ole32'),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cc.find_library('oleaut32'),<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cc.find_library('shlwapi'), -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cc.find_library('uuid'),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cc.find_library('intl')])
+qga_vss =3D shared_module(
+=C2=A0 'qga-vss',
+=C2=A0 ['requester.cpp', 'provider.cpp', 'install.cpp&= #39;],
+=C2=A0 name_prefix: '',
+=C2=A0 cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-vir= tual-dtor', '-Wno-non-virtual-dtor'],
+=C2=A0 link_args: link_args,
+=C2=A0 vs_module_defs: 'qga-vss.def',
+=C2=A0 dependencies: [
+=C2=A0 =C2=A0 glib_dynamic, socket,
+=C2=A0 =C2=A0 cc.find_library('ole32'),
+=C2=A0 =C2=A0 cc.find_library('oleaut32'),
+=C2=A0 =C2=A0 cc.find_library('shlwapi'),
+=C2=A0 =C2=A0 cc.find_library('uuid'),
+=C2=A0 =C2=A0 cc.find_library('intl')
+=C2=A0 ]
+)

-=C2=A0 all_qga +=3D qga_vss
-endif
+all_qga +=3D qga_vss

=C2=A0midl =3D find_program('midl', required: false)
=C2=A0widl =3D find_program('widl', required: false)
--
2.34.1



--0000000000006d5c5e05d77fd398--