meson: remove useless libdl test

[PATCH] meson: remove useless libdl test

Paolo Bonzini posted 1 patch 2 years, 6 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20211110092454.30916-1-pbonzini@redhat.com

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>

accel/tcg/meson.build | 2 +-
meson.build           | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)

Expand all Fold all

[PATCH] meson: remove useless libdl test

Posted by Paolo Bonzini 2 years, 6 months ago

dlopen is never used after it is sought via cc.find_library, because
plugins use gmodule instead; remove the test.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 accel/tcg/meson.build | 2 +-
 meson.build           | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index 137a1a44cc..7a0a79d731 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -10,7 +10,7 @@ tcg_ss.add(files(
 ))
 tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
 tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c'))
-tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl])
+tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c')])
 specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
 
 specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
diff --git a/meson.build b/meson.build
index d714ebdb37..06ab63625e 100644
--- a/meson.build
+++ b/meson.build
@@ -566,13 +566,7 @@ endif
 spice_headers = spice.partial_dependency(compile_args: true, includes: true)
 
 rt = cc.find_library('rt', required: false)
-libdl = not_found
-if 'CONFIG_PLUGIN' in config_host
-  libdl = cc.find_library('dl', required: false)
-  if not cc.has_function('dlopen', dependencies: libdl)
-    error('dlopen not found')
-  endif
-endif
+
 libiscsi = not_found
 if not get_option('libiscsi').auto() or have_block
   libiscsi = dependency('libiscsi', version: '>=1.9.0',
-- 
2.33.1

Re: [PATCH] meson: remove useless libdl test

Posted by Thomas Huth 2 years, 6 months ago

On 10/11/2021 10.24, Paolo Bonzini wrote:
> dlopen is never used after it is sought via cc.find_library, because
> plugins use gmodule instead; remove the test.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   accel/tcg/meson.build | 2 +-
>   meson.build           | 8 +-------
>   2 files changed, 2 insertions(+), 8 deletions(-)

Right. I've just grep'ed for "dlopen" or the related dlfcn.h header in the 
sources and did not see any direct use.

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH] meson: remove useless libdl test

Posted by Alex Bennée 2 years, 6 months ago

Paolo Bonzini <pbonzini@redhat.com> writes:

> dlopen is never used after it is sought via cc.find_library, because
> plugins use gmodule instead; remove the test.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Queued to for-6.2/misc-fixes, thanks.

-- 
Alex Bennée