From nobody Tue Feb 10 12:57:33 2026 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1611302535; cv=none; d=zohomail.com; s=zohoarc; b=ZT6BIgZx7JazR1UU0UrGoaDj4ynvcBngJn7ActO70BhA6AHtEVHhZ6yP1Cd9sRaI0u4czdI7GIQ9s1z/IQXjMS2wpxUqJbUaKdlFS7uHooUmqaj5ToUx6y8cjZyghu3TUBUFjXGdZ/649vkVXb8WaVnIMdudPWve8MxXiB649ys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611302535; 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=gwMT4wME/e/rhFrD2/8KhDAW81JFvka49SbxIktzCuY=; b=jjss53tdds9OLQfIEXcjj2TawMnkVDDhT5bpXqN1NAgibB2dNYWMGqNrOXLdHTUnB/bwiMUzw17F0zbEjyv/3XswiaKgwQzoqjeYe0NUHtpnLxo/Oxl8ebsurgnEa2rHRLfwVYYO7QTvtnjc65SdZcR1EciStn8Yd4F1tjCUnnE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611302535724221.06393412841112; Fri, 22 Jan 2021 00:02:15 -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-387-UzaVO_ZYMZChGIvFvxBJ6g-1; Fri, 22 Jan 2021 03:02:12 -0500 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 A4BB01800D42; Fri, 22 Jan 2021 08:02:06 +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 4CB6A6F7E4; Fri, 22 Jan 2021 08:02: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 7AB37180954D; Fri, 22 Jan 2021 08:02:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10M8218Q010755 for ; Fri, 22 Jan 2021 03:02:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id BE72571CBB; Fri, 22 Jan 2021 08:02:01 +0000 (UTC) Received: from tilapia.redhat.com (ovpn-113-127.rdu2.redhat.com [10.10.113.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EF3571CB0 for ; Fri, 22 Jan 2021 08:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611302534; 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=gwMT4wME/e/rhFrD2/8KhDAW81JFvka49SbxIktzCuY=; b=FnU85LXHLzNEMW9rE3SQjWLgONbZK/TEfq7Zg2Yafrdt1YoLLZgR7b3dmxkmRXac9/RD+X BaaBrjog+quNaBv4joqP6qJgG+80aRjVWJQ2fCs2egkxQkLDAwpGDNyFa5tKiJBsGpX56L uIS1lGYJmpuu2jaU/k2vxKiWjh+DMDE= X-MC-Unique: UzaVO_ZYMZChGIvFvxBJ6g-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 1/3] build: support explicitly disabling netcf Date: Fri, 22 Jan 2021 03:01:55 -0500 Message-Id: <20210122080157.669326-2-laine@redhat.com> In-Reply-To: <20210122080157.669326-1-laine@redhat.com> References: <20210122080157.669326-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" placing "-Dnetcf=3Ddisabled" on the meson commandline was ignored, meaning that even with that option the build would get WITH_NETCF if the netcf-devel package was found - the only way to disable it was to uninstall netcf-devel. This patch adds the small bit of logic to check the netcf meson commandline option (in addition to whether netcf-devel is installed) before defining WITH_NETCF. Signed-off-by: Laine Stump --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index d8a63baac9..bfdffb16d2 100644 --- a/meson.build +++ b/meson.build @@ -1155,8 +1155,10 @@ libm_dep =3D cc.find_library('m', required : false) =20 netcf_version =3D '0.1.8' netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) -if netcf_dep.found() - conf.set('WITH_NETCF', 1) +if not get_option('netcf').disabled() + if netcf_dep.found() + conf.set('WITH_NETCF', 1) + endif endif =20 have_gnu_gettext_tools =3D false @@ -1550,7 +1552,7 @@ elif get_option('driver_hyperv').enabled() error('openwsman is required for the Hyper-V driver') endif =20 -if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIR= TD') and (udev_dep.found() or netcf_dep.found()) +if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIR= TD') and (udev_dep.found() or conf.has('WITH_NETCF')) conf.set('WITH_INTERFACE', 1) elif get_option('driver_interface').enabled() error('Requested the Interface driver without netcf or udev and libvirtd= support') @@ -2355,7 +2357,7 @@ libs_summary =3D { 'libssh': libssh_dep.found(), 'libssh2': libssh2_dep.found(), 'libutil': libutil_dep.found(), - 'netcf': netcf_dep.found(), + 'netcf': conf.has('WITH_NETCF'), 'NLS': have_gnu_gettext_tools, 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), --=20 2.29.2