External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add numactl build dependency

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-04-29 15:43:09 +02:00
parent e3e9f5892d
commit 8e181ac68d
4 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -109,7 +109,6 @@ fi
# Check for compiler and library settings. # Check for compiler and library settings.
LIBVIRT_ARG_NSS LIBVIRT_ARG_NSS
LIBVIRT_ARG_NUMACTL
LIBVIRT_ARG_OPENWSMAN LIBVIRT_ARG_OPENWSMAN
LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PCIACCESS
LIBVIRT_ARG_PM_UTILS LIBVIRT_ARG_PM_UTILS
@ -122,7 +121,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_NWFILTER
LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PCIACCESS
@ -415,7 +413,6 @@ AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXL
LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PCIACCESS
LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_PM_UTILS

34
m4/virt-numactl.m4
View File

@ -1,34 +0,0 @@
dnl The libnuma.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 <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_NUMACTL],[
LIBVIRT_ARG_WITH_FEATURE([NUMACTL], [numa], [check])
])
AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[
LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h])
AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitset=yes])
if test "$have_numa_bitmask_isbitset" = "yes"; then
AC_DEFINE_UNQUOTED([HAVE_NUMA_BITMASK_ISBITSET], 1, [whether numa_bitmask_isbitset is available])
fi
])
AC_DEFUN([LIBVIRT_RESULT_NUMACTL],[
LIBVIRT_RESULT_LIB([NUMACTL])
])

10
meson.build
View File

@ -1226,6 +1226,15 @@ if not get_option('nls').disabled()
endif endif
endif endif
numactl_dep = cc.find_library('numa', required: get_option('numactl'))
if numactl_dep.found()
conf.set('WITH_NUMACTL', 1)
if cc.has_function('numa_bitmask_isbitset', dependencies: [ numactl_dep ])
conf.set('HAVE_NUMA_BITMASK_ISBITSET', 1)
endif
endif
# readline 7.0 is the first version which includes pkg-config support # readline 7.0 is the first version which includes pkg-config support
readline_version = '7.0' readline_version = '7.0'
readline_dep = dependency('readline', version: '>=' + readline_version, required: false) readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
@ -1379,6 +1388,7 @@ libs_summary = {
'macvtap': conf.has('WITH_MACVTAP'), 'macvtap': conf.has('WITH_MACVTAP'),
'netcf': netcf_dep.found(), 'netcf': netcf_dep.found(),
'NLS': have_gnu_gettext_tools, 'NLS': have_gnu_gettext_tools,
'numaclt': numactl_dep.found(),
'readline': readline_dep.found(), 'readline': readline_dep.found(),
} }
summary(libs_summary, section: 'Libraries', bool_yn: true) summary(libs_summary, section: 'Libraries', bool_yn: true)

1
meson_options.txt
View File

@ -31,6 +31,7 @@ option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support'
option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device') option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device')
option('netcf', type: 'feature', value: 'auto', description: 'netcf support') option('netcf', type: 'feature', value: 'auto', description: 'netcf support')
option('nls', type: 'feature', value: 'auto', description: 'nls support') option('nls', type: 'feature', value: 'auto', description: 'nls support')
option('numactl', type: 'feature', value: 'auto', description: 'numactl support')
option('readline', type: 'feature', value: 'auto', description: 'readline support') option('readline', type: 'feature', value: 'auto', description: 'readline support')