From nobody Sun Feb 8 07:14:32 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=1594894092; cv=none; d=zohomail.com; s=zohoarc; b=KczmhCeZzpiWf7kn+RNsQtS9xJ9w3YuJ++tWCQMuxPcoBVF231HrmWAkaI2/zr3dWDJNnLh7JzekT3MvTjPwvLGUvUHssGF1ym+H90YGUyrJVubScriOCH4Gmz1skUhXWi4Tjse4E8DPx5/TYaV6KCkUyGNoRXaqHG9OMVw2/mA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894092; 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=Bd8wGtAjRu/2/AanozXI7C2zi0HsKsDCXua1r0UV31A=; b=ZWmcd1vPSzI+xQMpROhKkMuQy5wzxo10Xuivid9eGDBl4n62nQs1qxtyF9ADp/e0L3KiYqnRgkI8735CAbHn4sCYe/tueZYii15caNO2MJvkDW0HWjS8SLKIqsu3JcvPwlpOiHsecg9iQ4Q2ERthcM9Ji1333qLMQxS646EBUms= 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 1594894092722444.1262494996448; Thu, 16 Jul 2020 03:08:12 -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-7-5zfJNzfdOI2cpOwBWFIx5Q-1; Thu, 16 Jul 2020 06:03:05 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 734BD803622; Thu, 16 Jul 2020 10:02:37 +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 53BBF79D06; Thu, 16 Jul 2020 10:02:37 +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 2402696232; Thu, 16 Jul 2020 10:02:37 +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 06GA2UGb016458 for ; Thu, 16 Jul 2020 06:02:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8CF192DE6F; Thu, 16 Jul 2020 10:02:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 084232B6DB for ; Thu, 16 Jul 2020 10:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894091; 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=Bd8wGtAjRu/2/AanozXI7C2zi0HsKsDCXua1r0UV31A=; b=TWnAdlS6OkoyVkiY+B7JQ1wreFo5rXgq6eXYBMMxyFj5hDCSOP7zum7iZqE3ZItccP1GoC z6042V/7sQQB2XHHrj56ucMSjRodYrEJCnPNd31aTS8LbhZZmxBZV84rtoWcmE9dWoA7lY waXMqZFkceWue1sY3oPzFdsrtURgP7s= X-MC-Unique: 5zfJNzfdOI2cpOwBWFIx5Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 073/351] meson: add udev build options Date: Thu, 16 Jul 2020 11:55:09 +0200 Message-Id: <3cf2b5eaded1eb04fa1004e455a928f8ad3ad327.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.13 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 | 3 --- m4/virt-udev.m4 | 36 ------------------------------------ meson.build | 11 +++++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-udev.m4 diff --git a/configure.ac b/configure.ac index 60cde7c3da7..da4873ea6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -109,14 +109,12 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR @@ -403,7 +401,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4 deleted file mode 100644 index 2e0f993e339..00000000000 --- a/m4/virt-udev.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The libudev.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_UDEV],[ - LIBVIRT_ARG_WITH_FEATURE([UDEV], [libudev], [check], [219]) -]) - -AC_DEFUN([LIBVIRT_CHECK_UDEV],[ - AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS]) - LIBVIRT_CHECK_PKG([UDEV], [libudev], [219]) - - if test "$with_udev" =3D "yes" && test "$with_pciaccess" !=3D "yes" ; th= en - AC_MSG_ERROR([You must install the pciaccess module to build with udev= ]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_UDEV],[ - AC_REQUIRE([LIBVIRT_RESULT_PCIACCESS]) - LIBVIRT_RESULT_LIB([UDEV]) -]) diff --git a/meson.build b/meson.build index 41c6075985d..453522fd79a 100644 --- a/meson.build +++ b/meson.build @@ -1364,6 +1364,12 @@ if not cc.compiles(pthread_sigmask_code) conf.set('FUNC_PTHREAD_SIGMASK_BROKEN', 1) endif =20 +udev_version =3D '219' +udev_dep =3D dependency('libudev', version: '>=3D' + udev_version, require= d: get_option('udev')) +if udev_dep.found() + conf.set('WITH_UDEV', 1) +endif + =20 # generic build dependencies checks =20 @@ -1414,6 +1420,10 @@ elif get_option('polkit').enabled() error('You must install dbus to compile libvirt with polkit-1') endif =20 +if udev_dep.found() and not pciaccess_dep.found() + error('You must install the pciaccess module to build with udev') +endif + =20 # define top include directory =20 @@ -1469,6 +1479,7 @@ libs_summary =3D { 'sanlock': conf.has('WITH_SANLOCK'), 'sasl': sasl_dep.found(), 'selinux': selinux_dep.found(), + 'udev': udev_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 40830f9494a..42b63444ee4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -39,3 +39,4 @@ option('sanlock', type: 'feature', value: 'auto', descrip= tion: 'sanlock support' option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') option('selinux', type: 'feature', value: 'auto', description: 'selinux su= pport') option('selinux_mount', type: 'string', value: '', description: 'set SELin= ux mount point') +option('udev', type: 'feature', value: 'auto', description: 'udev support') --=20 2.26.2