From c7fa462a879e2ae60aaa46f3b9fa91605cd188ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 20 Oct 2020 11:18:19 +0100 Subject: [PATCH] meson: remove non-pkg-config fallback for devmapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Daniel P. Berrangé --- meson.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meson.build b/meson.build index a17d759702..c3ba34bbe0 100644 --- a/meson.build +++ b/meson.build @@ -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