From nobody Sun Apr 28 17:48:02 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; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1611074000; cv=none; d=zohomail.com; s=zohoarc; b=S8oADwcx7ChTQxJkR1a2qKr/kyp0fwQ8T+itSwRT+EqcJNqZ4mKwZ+OkaXaLO9k8y+mSIo7m6l83+Nerub+Qd7HX1KqYn++08eQMS/URBQISdK/kuFRLBfMIMtGYjeBsC0/Lz2s2ErP5JfERZSwz1sDI1bmLrp6kTToMCMK6h3M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611074000; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=HxQDpRuwEJO04ZUCB2QDB3y5I9hJJU2inpwhJ9D2nQU=; b=lyhJLCDVVqUFJ4LhtITQC3TTNTClEW6arDUFRth+QMsZaJ+mY0adQ7hgzQ3lPEuMIh8P1awvr+/cU7NSDxz6p9m9Dy4rhfUV2CrD0L+eYQhqQbicgdGMbwaxKzsZbByoHKOlcbAvQIdLb/L2PRZ/lyQg9DXVzEH6N2rYGqramgU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) 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 1611074000233693.660773774516; Tue, 19 Jan 2021 08:33:20 -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-292-CH4coIfQOruVuPkq0uF1og-1; Tue, 19 Jan 2021 11:33:16 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 095B110054FF; Tue, 19 Jan 2021 16:33:11 +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 BCCAF669F2; Tue, 19 Jan 2021 16:33:10 +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 E54F1180954D; Tue, 19 Jan 2021 16:33:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10JGX81n001489 for ; Tue, 19 Jan 2021 11:33:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id C16692022782; Tue, 19 Jan 2021 16:33:08 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BCAB52022780 for ; Tue, 19 Jan 2021 16:33:05 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DD6D5811E78 for ; Tue, 19 Jan 2021 16:33:05 +0000 (UTC) Received: from relay3.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-515-gDqTtXNbNJu2dJtxmWZZfQ-1; Tue, 19 Jan 2021 11:33:03 -0500 Received: from [10.28.15.168] (helo=vz7.sw.ru.) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1l1tuu-00H3Lm-Es for libvir-list@redhat.com; Tue, 19 Jan 2021 19:31:40 +0300 X-MC-Unique: CH4coIfQOruVuPkq0uF1og-1 X-MC-Unique: gDqTtXNbNJu2dJtxmWZZfQ-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH v2] meson: build vstorage only on linux Date: Tue, 19 Jan 2021 19:31:42 +0300 Message-Id: <1611073902-306752-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This should fix CI error: ../dist-unpack/libvirt-7.1.0/src/storage/storage_backend_vstorage.c:10:= 10: fatal error: 'mntent.h' file not found #include ^~~~~~~~~~ on freebsd and mac. Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Daniel P. Berrang=C3=A9 --- meson.build | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index e3e7ff7..d8a63ba 100644 --- a/meson.build +++ b/meson.build @@ -1957,8 +1957,19 @@ if conf.has('WITH_LIBVIRTD') endif =20 if not get_option('storage_vstorage').disabled() - use_storage =3D true - conf.set('WITH_STORAGE_VSTORAGE', 1) + vstorage_enable =3D true + if host_machine.system() !=3D 'linux' + if get_option('storage_fs').enabled() + error('Vstorage is supported only on Linux') + else + vstorage_enable =3D false + endif + endif + + if vstorage_enable + use_storage =3D true + conf.set('WITH_STORAGE_VSTORAGE', 1) + endif endif =20 if not get_option('storage_zfs').disabled() --=20 1.8.3.1