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.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 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
-- 
2.25.4

On 10/20/20 12:22 PM, Daniel P. Berrangé wrote:
> 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.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   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
> 

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

And I still owe us the complete drop of libdevmapper (used in 
src/storage/storage_backend_mpath.c and parthelper).

Michal

On a Tuesday in 2020, Michal Prívozník wrote:
>On 10/20/20 12:22 PM, Daniel P. Berrangé wrote:
>>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.
>>
>>Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>>---
>>  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
>>
>
>Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
>
>And I still owe us the complete drop of libdevmapper (used in 
>src/storage/storage_backend_mpath.c and parthelper).
>

You can file an issue for it, just in case some other brave soul wants
to volunteer for this task.

Jano

>Michal
>