From nobody Sun Feb 8 05:23:45 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=1594893770; cv=none; d=zohomail.com; s=zohoarc; b=XHVU9PwPE3klhLPjnyIR1tO9CvIN6OU6zgwOftgEJPfboZEaWxn2Xu1chWW2LBUnRM4IasGx+q5Mcwe6Kf/Fh0bqY0OLoLuHGxksrKZWV68nWRLNJgZ4crwxhXRVcHQy5Gldc6U1uLTmclZ1rikkbyHq4zCdFn+dIKHj2Jk3+rc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893770; 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=iy7RFqucATDLY+CEMt9TTudfVFvyYhj/yzr51O3Eqnc=; b=N/Rc+gQ1b6quNgF7dREfPthi22pzNL1Sa3wbGswvNp+6sOoe/HxjixXpQB9YVr1yslAXp5aLpr0vJvCpWfQ2LeUPrXOHJ4/x3nj5Opq5yNhPKmoTiGbBGEBiScCEQ5p7+fW3lcWKnizQG4AdcsALaL/yOXFqPo2fikVy8qBziIg= 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893770568689.2045967595498; Thu, 16 Jul 2020 03:02:50 -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-102-6_5SQHJEMKSK3GvhY8vOfg-1; Thu, 16 Jul 2020 06:02:46 -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 6D26B891992; Thu, 16 Jul 2020 10:02:11 +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 4638C6FEFE; Thu, 16 Jul 2020 10:02:11 +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 10FA496222; Thu, 16 Jul 2020 10:02:11 +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 06GA0sOC015583 for ; Thu, 16 Jul 2020 06:00:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 20EF12B6DC; Thu, 16 Jul 2020 10:00:54 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9045B2DE6F for ; Thu, 16 Jul 2020 10:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893769; 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=iy7RFqucATDLY+CEMt9TTudfVFvyYhj/yzr51O3Eqnc=; b=VStObHjbENBgt4jTFmOhk4m1XXTUOIQ5ubrtmpX+o2H0IU4fiuLogocoylD5bsAXPtO5vu 8UJ2hB1wfGkLsKHbn/vIHSVwXstEmcxu7qCgtZzqmlBB/rEEQxliAtBDJbKEnZQWA7TfHh 9P/60VYEys6H3djQl7zPG3PvEi4ASNA= X-MC-Unique: 6_5SQHJEMKSK3GvhY8vOfg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 033/351] meson: add acl build dependency Date: Thu, 16 Jul 2020 11:54:29 +0200 Message-Id: <3e2ac866ca7fb0a8deb4e5304a8218600173e186.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.79 on 10.5.11.12 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" Signed-off-by: Pavel Hrdina --- configure.ac | 2 -- m4/virt-acl.m4 | 37 ------------------------------------- meson.build | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-acl.m4 diff --git a/configure.ac b/configure.ac index d8ff2ba3900..53c87b4e293 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_ACL LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT @@ -480,7 +479,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_ACL LIBVIRT_RESULT_APPARMOR LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_AUDIT diff --git a/m4/virt-acl.m4 b/m4/virt-acl.m4 deleted file mode 100644 index d548729b1dd..00000000000 --- a/m4/virt-acl.m4 +++ /dev/null @@ -1,37 +0,0 @@ -dnl ACL support -dnl -dnl Copyright (C) 2017 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_CHECK_ACL], [ - - AC_CHECK_HEADERS([sys/acl.h]) - - ACL_CFLAGS=3D"" - ACL_LIBS=3D"" - with_acl=3Dno - if test "x$ac_cv_header_sys_acl_h:x$with_linux" =3D "xyes:xyes"; then - ACL_LIBS=3D"-lacl" - with_acl=3Dyes - fi - AC_SUBST([ACL_CFLAGS]) - AC_SUBST([ACL_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_ACL], [ - LIBVIRT_RESULT_LIB([ACL]) -]) diff --git a/meson.build b/meson.build index d4b3a9e910d..d8ff8e0d658 100644 --- a/meson.build +++ b/meson.build @@ -942,6 +942,16 @@ foreach name : optional_programs endforeach =20 =20 +# generic build dependencies + +if host_machine.system() =3D=3D 'linux' and cc.has_header('sys/acl.h') + acl_dep =3D cc.find_library('acl', required: false) + conf.set('HAVE_SYS_ACL_H', 1) +else + acl_dep =3D dependency('', required: false) +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') @@ -960,6 +970,11 @@ configure_file(output: 'meson-config.h', configuration= : conf) =20 # print configuration summary =20 +libs_summary =3D { + 'acl': acl_dep.found(), +} +summary(libs_summary, section: 'Libraries', bool_yn: true) + test_summary =3D { 'Coverage': coverage_flags.length() > 0, } --=20 2.26.2