External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add driver_modules build check

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-07-24 16:44:39 +02:00
parent 6700b5d54f
commit 583d365782
3 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -138,10 +138,6 @@ LIBVIRT_WIN_CHECK_SYMBOLS
LIBVIRT_WIN_CHECK_WINDRES LIBVIRT_WIN_CHECK_WINDRES
dnl Driver-Modules library support
LIBVIRT_CHECK_DRIVER_MODULES
# Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether
# we're building shared libraries. This is the name of the directory # we're building shared libraries. This is the name of the directory
# in which .o files will be created. # in which .o files will be created.
@ -180,10 +176,6 @@ AC_MSG_NOTICE([])
AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([Configuration summary])
AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([=====================])
AC_MSG_NOTICE([]) 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([Libraries])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NSS

38
m4/virt-driver-modules.m4
View File

@ -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 <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [
AC_REQUIRE([LIBVIRT_CHECK_DLOPEN])
with_driver_modules=$with_libvirtd
DRIVER_MODULES_CFLAGS=
if test "$with_driver_modules" = "yes"; then
if test "$with_dlfcn" != "yes" || test "$with_dlopen" != "yes"; then
AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driver modules])
fi
DRIVER_MODULES_LDFLAGS="-export-dynamic"
fi
AC_SUBST([DRIVER_MODULES_LDFLAGS])
])
AC_DEFUN([LIBVIRT_RESULT_DRIVER_MODULES], [
LIBVIRT_RESULT_LIB([DRIVER_MODULES])
])

13
meson.build
View File

@ -2077,6 +2077,14 @@ if chrdev_lock_files != ''
conf.set_quoted('VIR_CHRDEV_LOCK_FILE_PATH', chrdev_lock_files) conf.set_quoted('VIR_CHRDEV_LOCK_FILE_PATH', chrdev_lock_files)
endif endif
driver_modules_flags = []
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 modules')
endif
driver_modules_flags = libvirt_export_dynamic
endif
# define top include directory # define top include directory
@ -2139,6 +2147,11 @@ secdriver_summary = {
} }
summary(secdriver_summary, section: 'Security Drivers', bool_yn: true) summary(secdriver_summary, section: 'Security Drivers', bool_yn: true)
drivermod_summary = {
'driver_modules': driver_modules_flags.length() > 0,
}
summary(drivermod_summary, section: 'Driver Loadable Modules', bool_yn: true)
libs_summary = { libs_summary = {
'acl': acl_dep.found(), 'acl': acl_dep.found(),
'apparmor': apparmor_dep.found(), 'apparmor': apparmor_dep.found(),