From nobody Sat May 18 11:46:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606908744; cv=none; d=zohomail.com; s=zohoarc; b=jvM5QSHuQfyH1b9OE0dTi3EyrDfa10Fbn2Zsb0ESOqoYRNq6vjze0Bca7x8VWAuZRDB5N1jQyTSiGv1ZhA+SboF8iyZSllLCfKwxf37v05nbHBRZDfv8UTVlj4OLCvQwIksw71b4plbOYZ69Y8dvz7TaR7KFNWnhFx8ju2ShA4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606908744; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=oqYXNhqIUUeU2gC7sjCRXwobn31s6NrZGWWNXXKLmYE=; b=b9E8l5YB0qvQN94flT5I0PWZkH8y5gfnoOy4xo2B/yAYVSlEOvKYsnW7QCYnn1NFg03waHtiHjHQLv3C5kv/EhcdXhyzYg3bWtO/UvkJI0jhdI4vdB2HdcPbbxFww2scMHbnj+FaZeV79BUuLa0Km0QbxSxIGlQwAptmx/ngSIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606908743998724.7297826857451; Wed, 2 Dec 2020 03:32:23 -0800 (PST) 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-526-HVFe-a9LM2SQT9TMCI5HdA-1; Wed, 02 Dec 2020 06:32:12 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E05C8180A09A; Wed, 2 Dec 2020 11:32:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9518D60BFA; Wed, 2 Dec 2020 11:32:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4390C5002C; Wed, 2 Dec 2020 11:32:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B2BW3dl020560 for ; Wed, 2 Dec 2020 06:32:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id CFC495D9DD; Wed, 2 Dec 2020 11:32:03 +0000 (UTC) Received: from fedora.redhat.com (ovpn-115-57.ams2.redhat.com [10.36.115.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 904C65D9CA; Wed, 2 Dec 2020 11:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606908742; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=oqYXNhqIUUeU2gC7sjCRXwobn31s6NrZGWWNXXKLmYE=; b=CuyBrxI1YszBM9M0GiyzQ25MyigPFZ8dCWTjZUjuwCESmzuQCjv0DNagtzekj5Z+q6ODjc BtIphVNrebcSavLoNrtYQWc4ckmTBn8zZJOBrKgD9q6DWrbSlEZjRx4b17kLjn1LDPNH6W NzNFhTy/1C7whohY7JqER9F3m5N+dPI= X-MC-Unique: HVFe-a9LM2SQT9TMCI5HdA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] rpm: convert mingw spec to meson Date: Wed, 2 Dec 2020 11:31:56 +0000 Message-Id: <20201202113156.2443968-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The meson build system is configured to only ever build shared libraries, so we delete the -static sub-RPMs. The few driver conditionals are deleted as there was never any scenario in which their value changed. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- mingw-libvirt.spec.in | 205 +++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 124 deletions(-) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 06bb9dfe7f..0686cbaf78 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -11,26 +11,6 @@ %define supported_platform 0 %endif =20 -# Default to skipping autoreconf. Distros can change just this one line -# (or provide a command-line override) if they backport any patches that -# touch configure.ac or Makefile.am. -%{!?enable_autotools:%define enable_autotools 0} - -# The mingw build is client only. Set up defaults for hypervisor drivers -# that talk via a native remote protocol, and for which prereq mingw -# libraries exist. -%define with_esx 0%{!?_without_esx:1} -# missing libwsman, so can't build hyper-v -%define with_hyperv 0%{!?_without_hyperv:0} -%define with_xenapi 0%{!?_without_xenapi:1} -%define with_vz 0%{!?_without_vz:0} - -# RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) -%if 0%{?rhel} - %define with_xenapi 0 - %define with_hyperv 0 -%endif - Name: mingw-libvirt Version: @VERSION@ Release: 1%{?dist} @@ -74,20 +54,15 @@ BuildRequires: libxslt BuildRequires: python3 BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) -%if 0%{?enable_autotools} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext-devel -BuildRequires: libtool -%endif +BuildRequires: make +BuildRequires: meson +BuildRequires: ninja-build BuildRequires: python3-docutils =20 BuildRequires: mingw32-libssh2 BuildRequires: mingw64-libssh2 -%if %{with_esx} BuildRequires: mingw32-curl BuildRequires: mingw64-curl -%endif BuildRequires: cpp %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: rpcgen @@ -101,31 +76,19 @@ MinGW Windows libvirt virtualization library. # Mingw32 %package -n mingw32-libvirt Summary: %{summary} +Obsoletes: mingw32-libvirt < 7.0.0 =20 %description -n mingw32-libvirt MinGW Windows libvirt virtualization library. =20 -%package -n mingw32-libvirt-static -Summary: %{summary} -Requires: mingw32-libvirt =3D %{version}-%{release} - -%description -n mingw32-libvirt-static -MinGW Windows libvirt virtualization library, static version. - # Mingw64 %package -n mingw64-libvirt Summary: %{summary} +Obsoletes: mingw64-libvirt < 7.0.0 =20 %description -n mingw64-libvirt MinGW Windows libvirt virtualization library. =20 -%package -n mingw64-libvirt-static -Summary: %{summary} -Requires: mingw64-libvirt =3D %{version}-%{release} - -%description -n mingw64-libvirt-static -MinGW Windows libvirt virtualization library, static version. - %{?mingw_debug_package} =20 =20 @@ -138,55 +101,82 @@ echo "This RPM requires Fedora >=3D %{min_fedora}" exit 1 %endif =20 -%if ! %{with_esx} - %define _without_esx --without-esx -%endif - -%if ! %{with_hyperv} - %define _without_hyperv --without-hyperv -%endif - -%if ! %{with_xenapi} - %define _without_xenapi --without-xenapi -%endif - -%if ! %{with_vz} - %define _without_vz --without-vz -%endif - -%if 0%{?enable_autotools} -autoreconf -if -%endif - -# XXX enable SASL in future -%mingw_configure \ - --enable-static \ - --without-xen \ - --without-qemu \ - --without-openvz \ - --without-lxc \ - --without-vbox \ - %{?_without_xenapi} \ - --without-sasl \ - --without-polkit \ - --without-libvirtd \ - %{?_without_esx} \ - %{?_without_hyperv} \ - --without-vmware \ - --without-parallels \ - --without-netcf \ - --without-audit \ - --without-dtrace \ - --enable-expensive-tests - -%mingw_make %{?_smp_mflags} - +%mingw_meson \ + --auto-features=3Denabled \ + -Ddriver_remote=3Denabled \ + -Ddriver_esx=3Denabled \ + -Dcurl=3Denabled \ + -Ddocs=3Denabled \ + -Dapparmor=3Ddisabled \ + -Dattr=3Ddisabled \ + -Daudit=3Ddisabled \ + -Dbash_completion=3Ddisabled \ + -Dblkid=3Ddisabled \ + -Dcapng=3Ddisabled \ + -Ddriver_bhyve=3Ddisabled \ + -Ddriver_hyperv=3Ddisabled \ + -Ddriver_interface=3Ddisabled \ + -Ddriver_libvirtd=3Ddisabled \ + -Ddriver_libxl=3Ddisabled \ + -Ddriver_lxc=3Ddisabled \ + -Ddriver_network=3Ddisabled \ + -Ddriver_openvz=3Ddisabled \ + -Ddriver_qemu=3Ddisabled \ + -Ddriver_secrets=3Ddisabled \ + -Ddriver_vbox=3Ddisabled \ + -Ddriver_vmware=3Ddisabled \ + -Ddriver_vz=3Ddisabled \ + -Ddtrace=3Ddisabled \ + -Dexpensive_tests=3Denabled \ + -Dfirewalld=3Ddisabled \ + -Dfirewalld_zone=3Ddisabled \ + -Dfuse=3Ddisabled \ + -Dglusterfs=3Ddisabled \ + -Dhost_validate=3Ddisabled \ + -Dlibiscsi=3Ddisabled \ + -Dlibnl=3Ddisabled \ + -Dlibpcap=3Ddisabled \ + -Dlibssh2=3Ddisabled \ + -Dlibssh=3Ddisabled \ + -Dlogin_shell=3Ddisabled \ + -Dnetcf=3Ddisabled \ + -Dnls=3Ddisabled \ + -Dnss=3Ddisabled \ + -Dnumactl=3Ddisabled \ + -Dnumad=3Ddisabled \ + -Dopenwsman=3Ddisabled \ + -Dpciaccess=3Ddisabled \ + -Dpm_utils=3Ddisabled \ + -Dpolkit=3Ddisabled \ + -Dreadline=3Ddisabled \ + -Drpath=3Ddisabled \ + -Dsanlock=3Ddisabled \ + -Dsasl=3Ddisabled \ + -Dsecdriver_apparmor=3Ddisabled \ + -Dsecdriver_selinux=3Ddisabled \ + -Dselinux=3Ddisabled \ + -Dstorage_dir=3Ddisabled \ + -Dstorage_disk=3Ddisabled \ + -Dstorage_fs=3Ddisabled \ + -Dstorage_gluster=3Ddisabled \ + -Dstorage_iscsi_direct=3Ddisabled \ + -Dstorage_iscsi=3Ddisabled \ + -Dstorage_lvm=3Ddisabled \ + -Dstorage_mpath=3Ddisabled \ + -Dstorage_rbd=3Ddisabled \ + -Dstorage_scsi=3Ddisabled \ + -Dstorage_sheepdog=3Ddisabled \ + -Dstorage_vstorage=3Ddisabled \ + -Dstorage_zfs=3Ddisabled \ + -Dsysctl_config=3Ddisabled \ + -Dtests=3Ddisabled \ + -Dudev=3Ddisabled \ + -Dwireshark_dissector=3Ddisabled \ + -Dyajl=3Ddisabled +%mingw_ninja =20 %install -%mingw_make_install "DESTDIR=3D$RPM_BUILD_ROOT" - -# Libtool files don't need to be bundled -find $RPM_BUILD_ROOT -name "*.la" -delete +%mingw_ninja_install =20 rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter @@ -267,12 +257,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-gu= ests.sh %{mingw32_mandir}/man1/virt-pki-validate.1* %{mingw32_mandir}/man7/virkey*.7* =20 -%files -n mingw32-libvirt-static -%{mingw32_libdir}/libvirt.a -%{mingw32_libdir}/libvirt-lxc.a -%{mingw32_libdir}/libvirt-qemu.a -%{mingw32_libdir}/libvirt-admin.a - # Mingw64 %files -n mingw64-libvirt %dir %{mingw64_sysconfdir}/libvirt/ @@ -299,28 +283,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-gu= ests.sh =20 %dir %{mingw64_datadir}/libvirt/ %dir %{mingw64_datadir}/libvirt/schemas/ -%{mingw64_datadir}/libvirt/schemas/basictypes.rng -%{mingw64_datadir}/libvirt/schemas/capability.rng -%{mingw64_datadir}/libvirt/schemas/cputypes.rng -%{mingw64_datadir}/libvirt/schemas/domain.rng -%{mingw64_datadir}/libvirt/schemas/domainbackup.rng -%{mingw64_datadir}/libvirt/schemas/domaincaps.rng -%{mingw64_datadir}/libvirt/schemas/domaincheckpoint.rng -%{mingw64_datadir}/libvirt/schemas/domaincommon.rng -%{mingw64_datadir}/libvirt/schemas/domainsnapshot.rng -%{mingw64_datadir}/libvirt/schemas/interface.rng -%{mingw64_datadir}/libvirt/schemas/network.rng -%{mingw64_datadir}/libvirt/schemas/networkcommon.rng -%{mingw64_datadir}/libvirt/schemas/networkport.rng -%{mingw64_datadir}/libvirt/schemas/nodedev.rng -%{mingw64_datadir}/libvirt/schemas/nwfilter.rng -%{mingw64_datadir}/libvirt/schemas/nwfilter_params.rng -%{mingw64_datadir}/libvirt/schemas/nwfilterbinding.rng -%{mingw64_datadir}/libvirt/schemas/secret.rng -%{mingw64_datadir}/libvirt/schemas/storagecommon.rng -%{mingw64_datadir}/libvirt/schemas/storagepool.rng -%{mingw64_datadir}/libvirt/schemas/storagepoolcaps.rng -%{mingw64_datadir}/libvirt/schemas/storagevol.rng +%{mingw64_datadir}/libvirt/schemas/*.rng + %dir %{mingw64_datadir}/libvirt/api/ %{mingw64_datadir}/libvirt/api/libvirt-api.xml %{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml @@ -359,11 +323,4 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-gu= ests.sh %{mingw64_mandir}/man1/virt-pki-validate.1* %{mingw64_mandir}/man7/virkey*.7* =20 -%files -n mingw64-libvirt-static -%{mingw64_libdir}/libvirt.a -%{mingw64_libdir}/libvirt-lxc.a -%{mingw64_libdir}/libvirt-qemu.a -%{mingw64_libdir}/libvirt-admin.a - - %changelog --=20 2.28.0