From nobody Sun Feb 8 12:20:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1594895236; cv=none; d=zohomail.com; s=zohoarc; b=c/9pwOH3NIwI+JhN7SMPwFaPo89nroemtdEB//pC0gAGJm6U28VX9Fwb1zfiX+DEXUDP3pmUv9/EcxmMXJqKOXH+KixKd3m5MSqAtiM6COrnRt41uNPJtK3JyKecFvh5lL8HFMsCG9auod+i5NgKKtrs3FXN/W+LYOHs50QwWSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895236; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0Lb8u6dVKvHLBbxS4pF/5tRVbW+aY+LzxHhL4cu/o6I=; b=d5uEhunq5ZjGJ2XHUSeJ4fQknaW6yQPvipRBqcn16bk/LJAdp5u0t+HIDc4sZca2kWJ2E+g3LNz3EJgKa85Tq65omDWvZHdw4rae1zFvq8po6npXW5R8md9qzMbfCNP2thG/0zm9f2SC2OT7Qo5s6PXVur5ZpQ5r1jL+fPREoZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594895236501926.0437197484006; Thu, 16 Jul 2020 03:27:16 -0700 (PDT) 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-132-a6F51FONPhmWNGQbARc-kQ-1; Thu, 16 Jul 2020 06:15:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22C56800FF1; Thu, 16 Jul 2020 10:15:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00C9178482; Thu, 16 Jul 2020 10:15: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 BDD6C181D0BC; Thu, 16 Jul 2020 10:15:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA7lSJ021230 for ; Thu, 16 Jul 2020 06:07:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 56BE52DE9C; Thu, 16 Jul 2020 10:07:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4EEA2DE6B for ; Thu, 16 Jul 2020 10:07:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895235; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0Lb8u6dVKvHLBbxS4pF/5tRVbW+aY+LzxHhL4cu/o6I=; b=CawL5QRAtnbWd6lkPlDVIFLK63Jl4st/Ze22o16sDhC8Sb1UQaPrc+VaB5UrqTgmJIR47f 9iKEtFKKDJIXPXUcW5oMk4OEhtf/E1yRqWZubUcC0RhRIOKjlMNM+L3ih/pk4RmLu4xhlM 7d9l9THtXhKFv8lddsBroAvlqQJiPnY= X-MC-Unique: a6F51FONPhmWNGQbARc-kQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 343/351] meson: update spec file to use meson Date: Thu, 16 Jul 2020 11:59:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- libvirt.spec.in | 203 +++++++++++++++++++++--------------------------- meson.build | 1 - 2 files changed, 89 insertions(+), 115 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 522e36b6a51..94c8715faa1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -12,11 +12,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:%global enable_autotools 0} - # The hypervisor drivers that run in libvirtd %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} @@ -203,9 +198,9 @@ # compiler warning into errors without being worried about frequent # changes in reported warnings %if 0%{?rhel} - %define enable_werror --enable-werror + %define enable_werror -Dwerror=3Dtrue %else - %define enable_werror --disable-werror + %define enable_werror -Dwerror=3Dfalse %endif =20 %if 0%{?rhel} =3D=3D 7 @@ -257,12 +252,7 @@ Requires: libvirt-libs =3D %{version}-%{release} =20 # All build-time requirements. Run-time requirements are # listed against each sub-RPM -%if 0%{?enable_autotools} -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gettext-devel -BuildRequires: libtool -%endif %if 0%{?rhel} =3D=3D 7 BuildRequires: python36-docutils %else @@ -1006,219 +996,209 @@ exit 1 %endif =20 %if %{with_qemu} - %define arg_qemu --with-qemu + %define arg_qemu -Ddriver_qemu=3Denabled %else - %define arg_qemu --without-qemu + %define arg_qemu -Ddriver_qemu=3Ddisabled %endif =20 %if %{with_openvz} - %define arg_openvz --with-openvz + %define arg_openvz -Ddriver_openvz=3Denabled %else - %define arg_openvz --without-openvz + %define arg_openvz -Ddriver_openvz=3Ddisabled %endif =20 %if %{with_lxc} - %define arg_lxc --with-lxc - %define arg_login_shell --with-login-shell + %define arg_lxc -Ddriver_lxc=3Denabled + %define arg_login_shell -Dlogin_shell=3Denabled %else - %define arg_lxc --without-lxc - %define arg_login_shell --without-login-shell + %define arg_lxc -Ddriver_lxc=3Ddisabled + %define arg_login_shell -Dlogin_shell=3Ddisabled %endif =20 %if %{with_vbox} - %define arg_vbox --with-vbox + %define arg_vbox -Ddriver_vbox=3Denabled %else - %define arg_vbox --without-vbox + %define arg_vbox -Ddriver_vbox=3Ddisabled %endif =20 %if %{with_libxl} - %define arg_libxl --with-libxl + %define arg_libxl -Ddriver_libxl=3Denabled %else - %define arg_libxl --without-libxl + %define arg_libxl -Ddriver_libxl=3Ddisabled %endif =20 %if %{with_esx} - %define arg_esx --with-esx + %define arg_esx -Ddriver_esx=3Denabled %else - %define arg_esx --without-esx + %define arg_esx -Ddriver_esx=3Ddisabled %endif =20 %if %{with_hyperv} - %define arg_hyperv --with-hyperv + %define arg_hyperv -Ddriver_hyperv=3Denabled %else - %define arg_hyperv --without-hyperv + %define arg_hyperv -Ddriver_hyperv=3Ddisabled %endif =20 %if %{with_vmware} - %define arg_vmware --with-vmware + %define arg_vmware -Ddriver_vmware=3Denabled %else - %define arg_vmware --without-vmware + %define arg_vmware -Ddriver_vmware=3Ddisabled %endif =20 %if %{with_storage_rbd} - %define arg_storage_rbd --with-storage-rbd + %define arg_storage_rbd -Dstorage_rbd=3Denabled %else - %define arg_storage_rbd --without-storage-rbd + %define arg_storage_rbd -Dstorage_rbd=3Ddisabled %endif =20 %if %{with_storage_sheepdog} - %define arg_storage_sheepdog --with-storage-sheepdog + %define arg_storage_sheepdog -Dstorage_sheepdog=3Denabled %else - %define arg_storage_sheepdog --without-storage-sheepdog + %define arg_storage_sheepdog -Dstorage_sheepdog=3Ddisabled %endif =20 %if %{with_storage_gluster} - %define arg_storage_gluster --with-storage-gluster + %define arg_storage_gluster -Dstorage_gluster=3Denabled %else - %define arg_storage_gluster --without-storage-gluster + %define arg_storage_gluster -Dstorage_gluster=3Ddisabled %endif =20 %if %{with_storage_zfs} - %define arg_storage_zfs --with-storage-zfs + %define arg_storage_zfs -Dstorage_zfs=3Denabled %else - %define arg_storage_zfs --without-storage-zfs + %define arg_storage_zfs -Dstorage_zfs=3Ddisabled %endif =20 %if %{with_numactl} - %define arg_numactl --with-numactl + %define arg_numactl -Dnumactl=3Denabled %else - %define arg_numactl --without-numactl + %define arg_numactl -Dnumactl=3Ddisabled %endif =20 %if %{with_numad} - %define arg_numad --with-numad + %define arg_numad -Dnumad=3Denabled %else - %define arg_numad --without-numad + %define arg_numad -Dnumad=3Ddisabled %endif =20 %if %{with_fuse} - %define arg_fuse --with-fuse + %define arg_fuse -Dfuse=3Denabled %else - %define arg_fuse --without-fuse + %define arg_fuse -Dfuse=3Ddisabled %endif =20 %if %{with_sanlock} - %define arg_sanlock --with-sanlock + %define arg_sanlock -Dsanlock=3Denabled %else - %define arg_sanlock --without-sanlock + %define arg_sanlock -Dsanlock=3Ddisabled %endif =20 %if %{with_firewalld} - %define arg_firewalld --with-firewalld + %define arg_firewalld -Dfirewalld=3Denabled %else - %define arg_firewalld --without-firewalld + %define arg_firewalld -Dfirewalld=3Ddisabled %endif =20 %if %{with_firewalld_zone} - %define arg_firewalld_zone --with-firewalld-zone + %define arg_firewalld_zone -Dfirewalld_zone=3Denabled %else - %define arg_firewalld_zone --without-firewalld-zone + %define arg_firewalld_zone -Dfirewalld_zone=3Ddisabled %endif =20 %if %{with_wireshark} - %define arg_wireshark --with-wireshark-dissector + %define arg_wireshark -Dwireshark_dissector=3Denabled %else - %define arg_wireshark --without-wireshark-dissector + %define arg_wireshark -Dwireshark_dissector=3Ddisabled %endif =20 %if %{with_storage_iscsi_direct} - %define arg_storage_iscsi_direct --with-storage-iscsi-direct + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Denabled %else - %define arg_storage_iscsi_direct --without-storage-iscsi-direct + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Ddisabled %endif =20 %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} -%define arg_packager --with-packager=3D"%{who}, %{when}, %{where}" -%define arg_packager_version --with-packager-version=3D"%{release}" +%define arg_packager -Dpackager=3D"%{who}, %{when}, %{where}" +%define arg_packager_version -Dpackager_version=3D"%{release}" =20 -%define arg_selinux_mount --with-selinux-mount=3D"/sys/fs/selinux" +%define arg_selinux_mount -Dselinux_mount=3D"/sys/fs/selinux" =20 # place macros above and build commands below this comment =20 export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/%{name}.spec) =20 -%if 0%{?enable_autotools} - autoreconf -if -%endif - -rm -f po/stamp-po - -%define _configure ../configure -mkdir %{_vpath_builddir} -cd %{_vpath_builddir} - -%configure --enable-dependency-tracking \ - --with-runstatedir=3D%{_rundir} \ +%meson \ + -Drunstatedir=3D%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ %{?arg_vbox} \ %{?arg_libxl} \ - --with-sasl \ - --with-polkit \ - --with-libvirtd \ + -Dsasl=3Denabled \ + -Dpolkit=3Denabled \ + -Ddriver_libvirtd=3Denabled \ %{?arg_esx} \ %{?arg_hyperv} \ %{?arg_vmware} \ - --without-vz \ - --without-bhyve \ - --with-remote-default-mode=3Dlegacy \ - --with-interface \ - --with-network \ - --with-storage-fs \ - --with-storage-lvm \ - --with-storage-iscsi \ + -Ddriver_vz=3Ddisabled \ + -Ddriver_bhyve=3Ddisabled \ + -Dremote_default_mode=3Dlegacy \ + -Ddriver_interface=3Denabled \ + -Ddriver_network=3Denabled \ + -Dstorage_fs=3Denabled \ + -Dstorage_lvm=3Denabled \ + -Dstorage_iscsi=3Denabled \ %{?arg_storage_iscsi_direct} \ - --with-storage-scsi \ - --with-storage-disk \ - --with-storage-mpath \ + -Dstorage_scsi=3Denabled \ + -Dstorage_disk=3Denabled \ + -Dstorage_mpath=3Denabled \ %{?arg_storage_rbd} \ %{?arg_storage_sheepdog} \ %{?arg_storage_gluster} \ %{?arg_storage_zfs} \ - --without-storage-vstorage \ + -Dstorage_vstorage=3Ddisabled \ %{?arg_numactl} \ %{?arg_numad} \ - --with-capng \ + -Dcapng=3Denabled \ %{?arg_fuse} \ - --with-netcf \ - --with-selinux \ + -Dnetcf=3Denabled \ + -Dselinux=3Denabled \ %{?arg_selinux_mount} \ - --without-apparmor \ - --without-hal \ - --with-udev \ - --with-yajl \ + -Dapparmor=3Ddisabled \ + -Dsecdriver_apparmor=3Ddisabled \ + -Dhal=3Ddisabled \ + -Dudev=3Denabled \ + -Dyajl=3Denabled \ %{?arg_sanlock} \ - --with-libpcap \ - --with-macvtap \ - --with-audit \ - --with-dtrace \ - --with-driver-modules \ + -Dlibpcap=3Denabled \ + -Dmacvtap=3Denabled \ + -Daudit=3Denabled \ + -Ddtrace=3Denabled \ %{?arg_firewalld} \ %{?arg_firewalld_zone} \ %{?arg_wireshark} \ - --without-pm-utils \ - --with-nss-plugin \ + -Dpm_utils=3Ddisabled \ + -Dnss=3Denabled \ %{arg_packager} \ %{arg_packager_version} \ - --with-qemu-user=3D%{qemu_user} \ - --with-qemu-group=3D%{qemu_group} \ - --with-tls-priority=3D%{tls_priority} \ + -Dqemu_user=3D%{qemu_user} \ + -Dqemu_group=3D%{qemu_group} \ + -Dtls_priority=3D%{tls_priority} \ %{?enable_werror} \ - --enable-expensive-tests \ - --with-init-script=3Dsystemd \ + -Dexpensive_tests=3Denabled \ + -Dinit_script=3Dsystemd \ %{?arg_login_shell} -make %{?_smp_mflags} V=3D1 + +%meson_build =20 %install rm -fr %{buildroot} =20 export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/%{name}.spec) =20 -cd %{_vpath_builddir} -%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=3D%{_unitdir} V=3D1 +%meson_install =20 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a @@ -1299,12 +1279,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvi= rt_qemu_probes.stp \ %endif =20 %check -cd %{_vpath_builddir} -if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=3D1 -then - cat tests/test-suite.log || true - exit 1 -fi +VIR_TEST_DEBUG=3D1 %meson_test =20 %post libs %if 0%{?rhel} =3D=3D 7 @@ -1511,7 +1486,7 @@ exit 0 =20 %files docs %doc AUTHORS ChangeLog NEWS.rst README README.rst -%doc %{_vpath_builddir}/libvirt-docs/* +%doc libvirt-docs/* =20 %files daemon =20 @@ -1884,7 +1859,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh =20 -%files libs -f %{_vpath_builddir}/%{name}.lang +%files libs -f %{name}.lang %license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf diff --git a/meson.build b/meson.build index 587e05a02da..69aead8a442 100644 --- a/meson.build +++ b/meson.build @@ -2280,7 +2280,6 @@ if git # Using return values from configure_file in add_dist_script is possible= since 0.55.0 dist_files =3D [ 'libvirt.spec', - 'mingw-libvirt.spec', 'AUTHORS', ] =20 --=20 2.26.2