From nobody Sun Feb 8 21:42:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1594894086; cv=none; d=zohomail.com; s=zohoarc; b=AgcYQRO+4AQb9cWi1R9LUa6s5rMKqhID8qQp0j6Bol54UcQRVe25t/6VASND2Q8Do3mB5+H6cXWRN0Tz0dJuo/QGfX4d1gPDlzVGjte3MeTsOdVFpfABvpD7lr2E5nYowzRrawlLoKRe5FSnP2JgolMclYAvja3eS7jua1zK9Nw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894086; 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=GtTsTRE948kSXMmd23SoO5HgHhzefP5rUPk2IRrbR0k=; b=HDUWWKOLTHBS4Bo8cBVUoCbvuAY3EQneIJk/EE0CPXXl9S2XfCqEJU4AOCBhJZsflZREXk7dNR7JRd9opBZ+Y58TIHp7zVoigZECey2ClZPu4nqBClKDmlMee19bXXIfFsqPJivkAmBTWyUD/bb0I02EqGSr9SkX7VayXXv7g0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894086647757.1326675577848; Thu, 16 Jul 2020 03:08:06 -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-297-lFG6VAavN5KhnNsHj1H_Lg-1; Thu, 16 Jul 2020 06:01:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 294178027F9; Thu, 16 Jul 2020 10:01: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 0461B1053B21; Thu, 16 Jul 2020 10:01: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 C1A0D1804768; Thu, 16 Jul 2020 10:01:05 +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 06GA100V015674 for ; Thu, 16 Jul 2020 06:01:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7FAD92B6DC; Thu, 16 Jul 2020 10:01:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEA822DE69 for ; Thu, 16 Jul 2020 10:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894085; 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=GtTsTRE948kSXMmd23SoO5HgHhzefP5rUPk2IRrbR0k=; b=GrVQtt8iSKZCvYrBXTa+AbEF+P23HSYx3I5mbRzG+Qmk3clycp6Xa7cm6xiHDjmtcDkmC7 0gVsh3Nx+cvtZ0DAYhQV/wQZ4nEfVIPcxjIgqNOT4TOMs4ZWMe0FQY+xj57NYi4bdBnqhb AD5/y5GbuaJv0eQQn0yuEsbCOrx0WbM= X-MC-Unique: lFG6VAavN5KhnNsHj1H_Lg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 040/351] meson: add capng build dependency Date: Thu, 16 Jul 2020 11:54:36 +0200 Message-Id: <46a79b038c7456ed4b21aed93186c2aa54d11449.1594891445.git.phrdina@redhat.com> 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.84 on 10.5.11.22 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-capng.m4 | 30 ------------------------------ meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-capng.m4 diff --git a/configure.ac b/configure.ac index 25fb8ca8f5f..acd326adf71 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS LIBVIRT_ARG_FIREWALLD @@ -144,7 +143,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DEVMAPPER @@ -467,7 +465,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DLOPEN diff --git a/m4/virt-capng.m4 b/m4/virt-capng.m4 deleted file mode 100644 index bf9fcd2aa84..00000000000 --- a/m4/virt-capng.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libcapng.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_CAPNG],[ - LIBVIRT_ARG_WITH_FEATURE([CAPNG], [cap-ng], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CAPNG],[ - LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h]) -]) - -AC_DEFUN([LIBVIRT_RESULT_CAPNG],[ - LIBVIRT_RESULT_LIB([CAPNG]) -]) diff --git a/meson.build b/meson.build index 7988a7b0a13..d504e7720d2 100644 --- a/meson.build +++ b/meson.build @@ -974,6 +974,11 @@ if blkid_dep.found() conf.set('WITH_BLKID', 1) endif =20 +capng_dep =3D cc.find_library('cap-ng', required: get_option('capng')) +if capng_dep.found() + conf.set('WITH_CAPNG', 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) @@ -1089,6 +1094,7 @@ libs_summary =3D { 'audit': audit_dep.found(), 'bash_completion': bash_completion_dep.found(), 'blkid': blkid_dep.found(), + 'capng': capng_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 73e64f26b0a..f53c94c6982 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,4 +15,5 @@ option('audit', type: 'feature', value: 'auto', descripti= on: 'audit support') 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('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2