[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 33/39] configure: move -ldl test to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 33/39] configure: move -ldl test to meson |
Date: |
Wed, 2 Sep 2020 08:59:11 -0400 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
accel/tcg/meson.build | 2 +-
configure | 1 -
meson.build | 4 ++++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index 2a335b50f2..96a76ed23d 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -9,7 +9,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'))
+tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl])
specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true:
files('tcg-all.c', 'cputlb.c'))
diff --git a/configure b/configure
index 95a259d420..033eb43428 100755
--- a/configure
+++ b/configure
@@ -7403,7 +7403,6 @@ fi
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
- LIBS="-ldl $LIBS"
# Copy the export object list to the build dir
if test "$ld_dynamic_list" = "yes" ; then
echo "CONFIG_HAS_LD_DYNAMIC_LIST=yes" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 4c32f5286f..0452de8d0e 100644
--- a/meson.build
+++ b/meson.build
@@ -217,6 +217,10 @@ libmpathpersist = not_found
if config_host.has_key('CONFIG_MPATH')
libmpathpersist = cc.find_library('mpathpersist')
endif
+libdl = not_found
+if 'CONFIG_PLUGIN' in config_host
+ libdl = cc.find_library('dl', required: true)
+endif
libiscsi = not_found
if 'CONFIG_LIBISCSI' in config_host
libiscsi = declare_dependency(compile_args:
config_host['LIBISCSI_CFLAGS'].split(),
--
2.26.2
- [PATCH 32/39] meson: keep all compiler flags detection together, (continued)
- [PATCH 32/39] meson: keep all compiler flags detection together, Paolo Bonzini, 2020/09/02
- [PATCH 34/39] configure: remove unnecessary libm test, Paolo Bonzini, 2020/09/02
- [PATCH 39/39] docs: suggest Meson replacements for various configure functions, Paolo Bonzini, 2020/09/02
- [PATCH 36/39] meson: get glib compilation flags from GLIB_CFLAGS, Paolo Bonzini, 2020/09/02
- [PATCH 16/39] meson: convert the unit tests, Paolo Bonzini, 2020/09/02
- [PATCH 37/39] configure: do not include dependency flags in QEMU_CFLAGS and LIBS, Paolo Bonzini, 2020/09/02
- [PATCH 30/39] configure: move disassembler configuration to meson, Paolo Bonzini, 2020/09/02
- [PATCH 27/39] meson: compute config_all_devices directly, Paolo Bonzini, 2020/09/02
- [PATCH 28/39] Makefile: remove dead variables and includes, Paolo Bonzini, 2020/09/02
- [PATCH 38/39] configure: drop dead variables, Paolo Bonzini, 2020/09/02
- [PATCH 33/39] configure: move -ldl test to meson,
Paolo Bonzini <=
- [PATCH 35/39] configure: do not look for install(1), Paolo Bonzini, 2020/09/02
- Re: [PATCH 00/39] Next round of Meson fixes and cleanups, Marc-André Lureau, 2020/09/02