meson: remove non-pkg-config fallback for devmapper

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>
This commit is contained in:
Daniel P. Berrangé 2020-10-20 11:18:19 +01:00
parent 92ac61ea5e
commit c7fa462a87

View File

@ -1020,13 +1020,6 @@ endif
devmapper_version = '1.0.0' devmapper_version = '1.0.0'
devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: false) 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() if devmapper_dep.found()
conf.set('WITH_DEVMAPPER', 1) conf.set('WITH_DEVMAPPER', 1)
endif endif