diff options
| author | Paolo Bonzini | 2021-06-01 10:00:48 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-06-04 13:47:07 +0200 |
| commit | 7fa1c63553242ad557c26dafd01e828ff1507c64 (patch) | |
| tree | 9bf25f6ed6825e86fd0cb686c4e6a13aadd5d3ad | |
| parent | meson: allow optional dependencies for block modules (diff) | |
| download | qemu-7fa1c63553242ad557c26dafd01e828ff1507c64.tar.gz qemu-7fa1c63553242ad557c26dafd01e828ff1507c64.tar.xz qemu-7fa1c63553242ad557c26dafd01e828ff1507c64.zip | |
iscsi: link libm into the module
Depending on the configuration of QEMU, some binaries might not need libm
at all. In that case libiscsi, which uses exp(), will fail to load.
Link it in the module explicitly.
Reported-by: Yi Sun <yisun@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | block/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/meson.build b/block/meson.build index 9e3388f633..01861e1545 100644 --- a/block/meson.build +++ b/block/meson.build @@ -73,7 +73,7 @@ modsrc = [] foreach m : [ [curl, 'curl', files('curl.c')], [glusterfs, 'gluster', files('gluster.c')], - [libiscsi, 'iscsi', files('iscsi.c')], + [libiscsi, 'iscsi', [files('iscsi.c'), libm]], [libnfs, 'nfs', files('nfs.c')], [libssh, 'ssh', files('ssh.c')], [rbd, 'rbd', files('rbd.c')], diff --git a/meson.build b/meson.build index a45f1a844f..913cf2a41a 100644 --- a/meson.build +++ b/meson.build @@ -163,7 +163,7 @@ if targetos != 'linux' and get_option('multiprocess').enabled() endif multiprocess_allowed = targetos == 'linux' and not get_option('multiprocess').disabled() -m = cc.find_library('m', required: false) +libm = cc.find_library('m', required: false) util = cc.find_library('util', required: false) winmm = [] socket = [] @@ -1899,7 +1899,7 @@ util_ss.add_all(trace_ss) util_ss = util_ss.apply(config_all, strict: false) libqemuutil = static_library('qemuutil', sources: util_ss.sources() + stub_ss.sources() + genh, - dependencies: [util_ss.dependencies(), m, glib, socket, malloc, pixman]) + dependencies: [util_ss.dependencies(), libm, glib, socket, malloc, pixman]) qemuutil = declare_dependency(link_with: libqemuutil, sources: genh + version_res) |