From nobody Thu May 2 18:33:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1611063797; cv=none; d=zohomail.com; s=zohoarc; b=RzVcHRbbzCjdkzkOmpT33a6YwRhiM8Gv5jxjEcUzY0piDFLJXblikXt/Zm9fjyzeujSKSw+LTZmu01YABetd2ivkXogrYUiU13EZjnwNryXz0zD7w/ShuCyJ45pPaL+qDihwLVTUi5gSNRYG4K7cGzrp9x7L8JrChlUUrb1mYUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611063797; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=sy8u2qVLJkJKBL0UPLu3ie/A6N3rFv311a+ZJnuz4S0=; b=Zln2piszBolhWSs+d8aS58CzbbRPExLecVNocUNb3ZADut5KmW3K3ubC49D0zD7q+WDbpidU1mJs1+1EQENq+cU0AKor6glvN9x0igBh70wwcavr1sNt9LhwnjINMWvWqTvdxf1nGqCcx8lsvtUolvZqVduOA0F4jCZcxzGgej0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611063796810588.1758835061958; Tue, 19 Jan 2021 05:43:16 -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-297-uzW-yCltMiegLWDS86zQ3Q-1; Tue, 19 Jan 2021 08:43:13 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3231107ACE4; Tue, 19 Jan 2021 13:43: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 D32685C8A7; Tue, 19 Jan 2021 13:43:05 +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 D23454A7C6; Tue, 19 Jan 2021 13:43:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10JDh03P013199 for ; Tue, 19 Jan 2021 08:43:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 51CF02166B2E; Tue, 19 Jan 2021 13:43:00 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CB912166B2C for ; Tue, 19 Jan 2021 13:42:57 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 1C053101A560 for ; Tue, 19 Jan 2021 13:42:57 +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-343-HG66arL_Okm-zR_GJb2h7Q-1; Tue, 19 Jan 2021 08:42:54 -0500 Received: from [10.28.15.168] (helo=vz7.sw.ru.) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1l1rGE-00H2lb-WF for libvir-list@redhat.com; Tue, 19 Jan 2021 16:41:31 +0300 X-MC-Unique: uzW-yCltMiegLWDS86zQ3Q-1 X-MC-Unique: HG66arL_Okm-zR_GJb2h7Q-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH] meson: don't build vstorage where mntent.h is not present Date: Tue, 19 Jan 2021 16:41:35 +0300 Message-Id: <1611063695-280240-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.6 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.16 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 --- meson.build | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index e3e7ff7..a6b6169 100644 --- a/meson.build +++ b/meson.build @@ -1957,8 +1957,20 @@ 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 not cc.has_header('mntent.h') + if get_option('storage_fs').enabled() + error(' is required for the FS storage driver') + 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