[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/7] meson: remove useless libdl test
From: |
Alex Bennée |
Subject: |
[PULL 4/7] meson: remove useless libdl test |
Date: |
Tue, 16 Nov 2021 16:25:12 +0000 |
From: Paolo Bonzini <pbonzini@redhat.com>
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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20211110092454.30916-1-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211115142915.3797652-5-alex.bennee@linaro.org>
diff --git a/meson.build b/meson.build
index 2ece4fe088..baeaee4522 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',
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(
--
2.30.2
- [PULL for 6.2 0/7] misc build and test fixes, Alex Bennée, 2021/11/16
- [PULL 1/7] tests/docker: force NOUSER=1 for base images, Alex Bennée, 2021/11/16
- [PULL 2/7] tests/vm: sort the special variable list, Alex Bennée, 2021/11/16
- [PULL 3/7] tests/vm: don't build using TCG by default, Alex Bennée, 2021/11/16
- [PULL 4/7] meson: remove useless libdl test,
Alex Bennée <=
- [PULL 7/7] gitlab: skip cirrus jobs on master and stable branches, Alex Bennée, 2021/11/16
- [PULL 6/7] gitlab-ci: Split custom-runners.yml in one file per runner, Alex Bennée, 2021/11/16
- [PULL 5/7] Jobs based on custom runners: add CentOS Stream 8, Alex Bennée, 2021/11/16
- Re: [PULL for 6.2 0/7] misc build and test fixes, Richard Henderson, 2021/11/16