From nobody Sun Feb 8 04:30:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893811; cv=none; d=zohomail.com; s=zohoarc; b=ZEOPM5aY5rVoXLWGHTV5E/Ooi4ckZyDGkGbU7yC9cr8O+1b3QXD2D9PDkncEJWcJBRmI6DDsVNOD5Cx+s+SjusDvgbGn/dpbHf730ZMpxSb6vsSrPh/LNAYQAAH2oHcD5/rzCC4prEu0fVtPv2aezpBZVBK/af0pCB+dE7jJ/TY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893811; 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=Y5lwCL2CCUt092Bv6v9Qw0nDYMxeWazDpBl+ATsdLBQ=; b=IbqIerGJOlo9jRnOecIz4cboNc1XPXht0xC39t8KgWJpLxfY+x9BquxWylkZt0rGAmeNXV20aC5QYxrGAKNKqX57MsRDtDfIANURoHkETaLuiKo0V5nEqKoHOB6gKEWnaloRRr+P3W/R5SQ3TICNTRHQgxXb7VXFQ7IDcoD/eJ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893811907720.5946002120323; Thu, 16 Jul 2020 03:03:31 -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-448-KEXSn3gjPPe384YthKI8PA-1; Thu, 16 Jul 2020 06:03:27 -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 C28281081; Thu, 16 Jul 2020 10:03:19 +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 9E5286FEF6; Thu, 16 Jul 2020 10:03:19 +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 6E6E9180531F; Thu, 16 Jul 2020 10:03:19 +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 06GA3Hm3017090 for ; Thu, 16 Jul 2020 06:03:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id E798B2B6E6; Thu, 16 Jul 2020 10:03:17 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6162A2B6DB for ; Thu, 16 Jul 2020 10:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893810; 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=Y5lwCL2CCUt092Bv6v9Qw0nDYMxeWazDpBl+ATsdLBQ=; b=WxSKQZ/mV1Ky8dBPJIyHhM4pROrWzcDlS2SvnF4qpRBz6qwBqM73EQqnutArIbFIKiuthj QREG2Xu9wTfxYwtIlfeX/UurhXHHKHqwDOtVnDuTcz8cwOQIke55ObP8welH3N8Fcg5bps LjYbkHK4E6ebx+cfyOmftvuWuRlnfX0= X-MC-Unique: KEXSn3gjPPe384YthKI8PA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 115/351] meson: add driver_modules build check Date: Thu, 16 Jul 2020 11:55:51 +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 --- configure.ac | 8 -------- m4/virt-driver-modules.m4 | 38 -------------------------------------- meson.build | 13 +++++++++++++ 3 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-driver-modules.m4 diff --git a/configure.ac b/configure.ac index 61e830a97eb..d97bc702299 100644 --- a/configure.ac +++ b/configure.ac @@ -136,10 +136,6 @@ LIBVIRT_WIN_CHECK_SYMBOLS LIBVIRT_WIN_CHECK_WINDRES =20 =20 -dnl Driver-Modules library support -LIBVIRT_CHECK_DRIVER_MODULES - - # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether # we're building shared libraries. This is the name of the directory # in which .o files will be created. @@ -178,10 +174,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Driver Loadable Modules]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DRIVER_MODULES -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_NSS diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4 deleted file mode 100644 index f7902283884..00000000000 --- a/m4/virt-driver-modules.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl The driver module support -dnl -dnl Copyright (C) 2016 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_DRIVER_MODULES], [ - AC_REQUIRE([LIBVIRT_CHECK_DLOPEN]) - - with_driver_modules=3D$with_libvirtd - - DRIVER_MODULES_CFLAGS=3D - if test "$with_driver_modules" =3D "yes"; then - if test "$with_dlfcn" !=3D "yes" || test "$with_dlopen" !=3D "yes"; th= en - AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driv= er modules]) - fi - - DRIVER_MODULES_LDFLAGS=3D"-export-dynamic" - fi - AC_SUBST([DRIVER_MODULES_LDFLAGS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_DRIVER_MODULES], [ - LIBVIRT_RESULT_LIB([DRIVER_MODULES]) -]) diff --git a/meson.build b/meson.build index d48912eedc9..681874fd447 100644 --- a/meson.build +++ b/meson.build @@ -2065,6 +2065,14 @@ endif =20 conf.set_quoted('DEFAULT_EDITOR', get_option('default_editor')) =20 +driver_modules_flags =3D [] +if conf.has('WITH_LIBVIRTD') + if not conf.has('HAVE_DLFCN_H') or not dlopen_dep.found() + error('You must have dlfcn.h / dlopen() support to build driver module= s') + endif + driver_modules_flags =3D libvirt_export_dynamic +endif + =20 # define top include directory =20 @@ -2127,6 +2135,11 @@ secdriver_summary =3D { } summary(secdriver_summary, section: 'Security Drivers', bool_yn: true) =20 +drivermod_summary =3D { + 'driver_modules': driver_modules_flags.length() > 0, +} +summary(drivermod_summary, section: 'Driver Loadable Modules', bool_yn: tr= ue) + libs_summary =3D { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), --=20 2.26.2