diff --git a/meson.build b/meson.build index 69302766a9..230a64e23a 100644 --- a/meson.build +++ b/meson.build @@ -1066,9 +1066,9 @@ gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version) # Check for BSD kvm (kernel memory interface) if host_machine.system() == 'freebsd' - kvm_dep = cc.find_library('kvm') + libkvm_dep = cc.find_library('kvm') else - kvm_dep = dependency('', required: false) + libkvm_dep = dependency('', required: false) endif libiscsi_version = '1.18.0' @@ -1160,7 +1160,7 @@ endif libxml_version = '2.9.1' libxml_dep = dependency('libxml-2.0', version: '>=' + libxml_version) -m_dep = cc.find_library('m', required : false) +libm_dep = cc.find_library('m', required : false) netcf_version = '0.1.8' netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf')) @@ -1372,7 +1372,7 @@ if udev_dep.found() conf.set('WITH_UDEV', 1) endif -util_dep = cc.find_library('util', required: false) +libutil_dep = cc.find_library('util', required: false) if host_machine.system() == 'windows' ole32_dep = cc.find_library('ole32') diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 975f93a9c0..2b65eecf5e 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -21,9 +21,9 @@ if conf.has('WITH_BHYVE') ], dependencies: [ access_dep, - kvm_dep, + libkvm_dep, + libutil_dep, src_dep, - util_dep, ], include_directories: [ conf_inc_dir, diff --git a/src/util/meson.build b/src/util/meson.build index 4d63173cbd..3b711b1dc2 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -187,13 +187,13 @@ virt_util_lib = static_library( devmapper_dep, gnutls_dep, intl_dep, + libm_dep, libnl_dep, - m_dep, + libutil_dep, numactl_dep, secdriver_dep, src_dep, thread_dep, - util_dep, win32_dep, yajl_dep, ],