From nobody Tue Feb 10 19:47:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1622536735; cv=none; d=zohomail.com; s=zohoarc; b=WofgUj9ESy9Gr8DTuzMCzXQPICBfXE81Aaede9Vqr64hcwOsFSPwsmSiHcjZU4aGiTYnIT6q4fAC01F/v3gAlutQIN9Ym8KPP0OHp4GpcyJLzRnsSeahTKPnaCupeXz1+4E3aMjGS9JWbVapO9ldFNBF2IqULb48EZ1HFii9ZJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536735; 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=GHpQGwXYmTectggBqLCnkTq4wAcvDMX5/RDi/Rpbe4Q=; b=P0x8iPozyqOtVJF+caQLewwCDSRrsKz1kBelNvrmGPh9hXd5csEYRDehacGuNXzxhA414+QcyA4Fy5Uye6qHI9hAaVXO5eJAYr2jlKg58DMmX/Vm9rB1EdyXvRwy5nM1GnSiRshrqscwFjxcRBbOB1go9I6cB/+YX4w6obbKayw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622536735847695.2062071235139; Tue, 1 Jun 2021 01:38:55 -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-588-X4fQ2hw3NuSlYqMurz-UjQ-1; Tue, 01 Jun 2021 04:38:47 -0400 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 D4A351899457; Tue, 1 Jun 2021 08:38:42 +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 B012D5C230; Tue, 1 Jun 2021 08:38:42 +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 23ACB1818457; Tue, 1 Jun 2021 08:38:42 +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 1518ccT0026252 for ; Tue, 1 Jun 2021 04:38:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9CA46163CD; Tue, 1 Jun 2021 08:38:38 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0654EE2D4 for ; Tue, 1 Jun 2021 08:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536733; 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=GHpQGwXYmTectggBqLCnkTq4wAcvDMX5/RDi/Rpbe4Q=; b=LqkyjjPnDXh4lPS/vJaglAegin4ylfoO+enP4dF603ykJ70U+89FBdr4tWwnwSQqEpPvhJ moa+eKb5NXI6fvYdH0RAYF3R1acyqtM1nmMRvSID0PwAxGecvduGJi4NJc88N+69Miituo mGPbGmkj9oad8J+czKvlS+8OIjkayDM= X-MC-Unique: X4fQ2hw3NuSlYqMurz-UjQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 24/26] meson: Style tweaks Date: Tue, 1 Jun 2021 10:37:55 +0200 Message-Id: <20210601083757.10194-25-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> 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.16 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" These checks look different than most similar ones for no particular reason. This commit is better viewed with 'git show -w'. Signed-off-by: Andrea Bolognani --- meson.build | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 1a2503488a..1d9c878fd0 100644 --- a/meson.build +++ b/meson.build @@ -991,12 +991,12 @@ endif libpcap_version =3D '1.5.0' if not get_option('libpcap').disabled() libpcap_dep =3D dependency('pcap', version: '>=3D' + libpcap_version, re= quired: get_option('libpcap')) + if libpcap_dep.found() + conf.set('WITH_LIBPCAP', 1) + endif else libpcap_dep =3D dependency('', required: false) endif -if libpcap_dep.found() - conf.set('WITH_LIBPCAP', 1) -endif =20 libssh_version =3D '0.7' if get_option('driver_remote').enabled() @@ -1139,19 +1139,19 @@ if not get_option('readline').disabled() endif endif endif + if readline_dep.found() + # We need this to avoid compilation issues with modern compilers. + # See 9ea3424a178 for a more detailed explanation + readline_dep =3D declare_dependency( + compile_args: [ '-D_FUNCTION_DEF' ], + dependencies: [ readline_dep ], + ) + + conf.set('WITH_READLINE', 1) + endif else readline_dep =3D dependency('', required: false) endif -if readline_dep.found() - # We need this to avoid compilation issues with modern compilers. - # See 9ea3424a178 for a more detailed explanation - readline_dep =3D declare_dependency( - compile_args: [ '-D_FUNCTION_DEF' ], - dependencies: [ readline_dep ], - ) - - conf.set('WITH_READLINE', 1) -endif =20 if not get_option('sanlock').disabled() sanlock_dep =3D dependency('libsanlock_client', required: get_option('sa= nlock')) @@ -1882,10 +1882,9 @@ if conf.has('WITH_LIBVIRTD') if not get_option('storage_vstorage').disabled() vstorage_enable =3D true if host_machine.system() !=3D 'linux' + vstorage_enable =3D false if get_option('storage_vstorage').enabled() error('Vstorage is supported only on Linux') - else - vstorage_enable =3D false endif endif =20 --=20 2.31.1