From nobody Sun Feb 8 10:29:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1594893676; cv=none; d=zohomail.com; s=zohoarc; b=YWaWxBgrdOwAKeiLKdnp4rGemAgdHY1lrEdnTeISi9PfX4mIYvIpBI+s+w1IYiRaqrXb1DESSjlFqcGo2Y833W//b8+1u8jN66Er0NfYLn2HvHsr9QZUEk3jowBxJ/gk9+s/3NQqBCn61cfbNztby1SjQCdhMaFRoTvjjsLa65Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893676; 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=Wxd/o9zClyHehK3Pip4NlH9HJn34S9R4KmG5T/m4TZM=; b=mCVivVNLevY7p/mUsQPNiB6X6dNpixSY1fPfLlOM691iUl8UC2RPDtEjbciJ+DfYLUCzGybfqUEzi0axfEemb66vhqrf/1T8mo9a6BrY8kniTTxdm5ZAgnsXrx9VwF1XVbKj5Z1QtDX0u/41lDi7WC9LQ1IakfWK1Cd8Ti30rgI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893676917484.7780774584186; Thu, 16 Jul 2020 03:01: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-282-_bTxQiCIMkaQ_fw-N4OqXQ-1; Thu, 16 Jul 2020 06:01:11 -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 8548B1081; Thu, 16 Jul 2020 10:01:02 +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 65EF96147E; Thu, 16 Jul 2020 10:01:02 +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 26F2F1806B0C; Thu, 16 Jul 2020 10:01:02 +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 06GA0xgU015659 for ; Thu, 16 Jul 2020 06:00:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9809B2B6DC; Thu, 16 Jul 2020 10:00:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 123712B6E6 for ; Thu, 16 Jul 2020 10:00:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893675; 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=Wxd/o9zClyHehK3Pip4NlH9HJn34S9R4KmG5T/m4TZM=; b=Do9ynOxu5eYNvZSKL+2UYUMzinYiGelhbO0fjIYCwg3QkzUXp7RebseSEb2i4Flmq8BkIR uW31ql7qfKdTigdzkv3agTN+meDGvCZqwvaE1SHmwGR/jEdusa5l3POr9BHtRb1btAufyM GxbhRTJiygDNelSGMzv82SmT8B4NsRY= X-MC-Unique: _bTxQiCIMkaQ_fw-N4OqXQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 039/351] meson: add blkid build dependency Date: Thu, 16 Jul 2020 11:54:35 +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.16 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 --- configure.ac | 3 --- m4/virt-blkid.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-blkid.m4 diff --git a/configure.ac b/configure.ac index a8f838c0ccf..25fb8ca8f5f 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_BLKID LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS @@ -145,7 +144,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_BLKID LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS @@ -469,7 +467,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_BLKID LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS diff --git a/m4/virt-blkid.m4 b/m4/virt-blkid.m4 deleted file mode 100644 index 609d0d58031..00000000000 --- a/m4/virt-blkid.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libblkid.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_BLKID],[ - LIBVIRT_ARG_WITH_FEATURE([BLKID], [blkid], [check], [2.17]) -]) - -AC_DEFUN([LIBVIRT_CHECK_BLKID],[ - LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17]) -]) - -AC_DEFUN([LIBVIRT_RESULT_BLKID],[ - LIBVIRT_RESULT_LIB([BLKID]) -]) diff --git a/meson.build b/meson.build index 5cca3b7d5c2..7988a7b0a13 100644 --- a/meson.build +++ b/meson.build @@ -968,6 +968,12 @@ endif bash_completion_version =3D '2.0' bash_completion_dep =3D dependency('bash-completion', version: '>=3D' + ba= sh_completion_version, required: get_option('bash_completion')) =20 +blkid_version =3D '2.17' +blkid_dep =3D dependency('blkid', version: '>=3D' + blkid_version, require= d: get_option('blkid')) +if blkid_dep.found() + conf.set('WITH_BLKID', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1082,6 +1088,7 @@ libs_summary =3D { 'attr': attr_dep.found(), 'audit': audit_dep.found(), 'bash_completion': bash_completion_dep.found(), + 'blkid': blkid_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 5313b9bb5fb..73e64f26b0a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,4 +14,5 @@ option('attr', type: 'feature', value: 'auto', descriptio= n: 'attr support') option('audit', type: 'feature', value: 'auto', description: 'audit suppor= t') option('bash_completion', type: 'feature', value: 'auto', description: 'ba= sh-completion support') option('bash_completion_dir', type: 'string', value: '', description: 'dir= ectory containing bash completion scripts') +option('blkid', type: 'feature', value: 'auto', description: 'blkid suppor= t') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2