From nobody Sun Feb 8 12:33:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1594893837; cv=none; d=zohomail.com; s=zohoarc; b=HfcCnlxhTwzPbmZlSS0JQ+9TFSdpYQxD3/m8otUhd95ovfIZxJWaxfw6pR4Z2/oKWfdqXguUa4KgUaKLdVAN2Pk8i7hwUjUpOFURyvm1N1hy+6cO1ILQHX35icG1Ip7I5Wk5mC7R8aozdTUxv8i1+5+jYFrYovn1mZuR2GDyzuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893837; 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=ub3OYckD7hFAZIv5NSsq0ItT8lOqqgGvXUbjKiXr440=; b=CMU8mn1E/XRwJiLyXIIDp71lyU19vOe5zANYsFjoEdVXb4uw2g+z7mYIzLTR/1YGXeIKBLiq7aElrAcNDGKCQE/rkzn3K8I728GYCVYhemLgnaToLu/kQw/PVwJqY5hcD2kZAyPbjBR/AQKE9MQQmWL6Ly5vK3LEMjHaEz3Oi44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594893837555322.0468858045821; Thu, 16 Jul 2020 03:03:57 -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-361-sPg0o-nMPg2kecx-Btg_9w-1; Thu, 16 Jul 2020 06:03:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1940A5AEFA; Thu, 16 Jul 2020 10:02:31 +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 E6E68610AF; Thu, 16 Jul 2020 10:02:30 +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 B0F6F96222; Thu, 16 Jul 2020 10:02:30 +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 06GA2Q0W016402 for ; Thu, 16 Jul 2020 06:02:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id F27332B6E2; Thu, 16 Jul 2020 10:02:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69DB72B6DB for ; Thu, 16 Jul 2020 10:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893836; 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=ub3OYckD7hFAZIv5NSsq0ItT8lOqqgGvXUbjKiXr440=; b=H3QSv6zntVq0pFbo6wYBFZ9ceKJizttlL5wcSPONwIwYF/DgPUj6BIMLfEiarkZ+N3WV6W Xt5d4dlH/5gG/2lOqvhYYUPIfwk2v5qHu7DJts4IsrxIOXgH+9Rqz7Q59sDu7cqJjuqxQp nBp4FJa1H7U6hSEFjEFEJ8uvpDiLucQ= X-MC-Unique: sPg0o-nMPg2kecx-Btg_9w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 068/351] meson: add rbd build dependency Date: Thu, 16 Jul 2020 11:55:04 +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.12 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 --- m4/virt-storage-rbd.m4 | 12 ------------ meson.build | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/m4/virt-storage-rbd.m4 b/m4/virt-storage-rbd.m4 index f3d9d049084..cd3b24ea2fa 100644 --- a/m4/virt-storage-rbd.m4 +++ b/m4/virt-storage-rbd.m4 @@ -25,18 +25,6 @@ AC_DEFUN([LIBVIRT_STORAGE_ARG_RBD], [ AC_DEFUN([LIBVIRT_STORAGE_CHECK_RBD], [ LIBRBD_LIBS=3D if test "$with_storage_rbd" =3D "yes" || test "$with_storage_rbd" =3D "c= heck"; then - AC_CHECK_HEADER([rbd/librbd.h], [LIBRBD_FOUND=3Dyes; break;]) - - if test "$LIBRBD_FOUND" =3D "yes"; then - LIBRBD_LIBS=3D"-lrbd -lrados" - - old_LIBS=3D"$LIBS" - LIBS=3D"$LIBS $LIBRBD_LIBS" - AC_CHECK_FUNCS([rbd_get_features],[],[LIBRBD_FOUND=3Dno]) - AC_CHECK_FUNCS([rbd_list2]) - LIBS=3D"$old_LIBS" - fi - if test "$LIBRBD_FOUND" =3D "yes"; then with_storage_rbd=3Dyes AC_DEFINE_UNQUOTED([WITH_STORAGE_RBD], [1], diff --git a/meson.build b/meson.build index e6dc0aa8717..d272b5cca05 100644 --- a/meson.build +++ b/meson.build @@ -1232,6 +1232,21 @@ else pkcheck_prog =3D dependency('', required: false) endif =20 +rbd_dep =3D cc.find_library('rbd', required: false) +rados_dep =3D cc.find_library('rados', required: false) +if rbd_dep.found() and not cc.has_function('rbd_get_features', dependencie= s: rbd_dep) + rbd_dep =3D dependency('', required: false) +endif +if rbd_dep.found() and rados_dep.found() + if cc.has_function('rbd_list2', dependencies: rbd_dep) + conf.set('HAVE_RBD_LIST2', 1) + endif + + rbd_dep =3D declare_dependency(dependencies: [ rbd_dep, rados_dep ]) +else + rbd_dep =3D dependency('', required: false) +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) @@ -1395,6 +1410,7 @@ libs_summary =3D { 'openwsman': openwsman_dep.found(), 'pciaccess': pciaccess_dep.found(), 'polkit': conf.has('WITH_POLKIT'), + 'rbd': rbd_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) --=20 2.26.2