]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: remove non-pkg-config fallback for devmapper
authorDaniel P. Berrangé <berrange@redhat.com>
Tue, 20 Oct 2020 10:18:19 +0000 (11:18 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Tue, 20 Oct 2020 16:50:38 +0000 (17:50 +0100)
The fallback for distros which lack pkg-config support for devmapper
references an undefined variable "tmp". It appears non of our supported
build platforms are triggering this bug and so the fallback code can be
removed entirely rather than fixed.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
meson.build

index a17d759702df3cf83d912803c3af638bfc803577..c3ba34bbe009e87da2e2155cb7144aef7a068a60 100644 (file)
@@ -1020,13 +1020,6 @@ endif
 
 devmapper_version = '1.0.0'
 devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: false)
-if not devmapper_dep.found()
-  # devmapper is missing pkg-config files in ubuntu, suse, etc
-  devmapper_dep = cc.find_library('devmapper', required: false)
-  if devmapper_dep.found() and not cc.has_function('dm_task_run', dependencies: tmp)
-    devmapper_dep = dependency('', required: false)
-  endif
-endif
 if devmapper_dep.found()
   conf.set('WITH_DEVMAPPER', 1)
 endif