| Message ID | 20210603130732.208065-2-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | iscsi: always link libm into the module | expand |
03.06.2021 16:07, Paolo Bonzini wrote: > Right now all dependencies for block modules are passed to > module_ss.add(when: ...), so they are mandatory. In the next patch we > will need to add a libm dependency to a module, but libm does not exist > on all systems. So, modify the creation of module_ss and modsrc so that > dependencies can also be passed to module_ss.add(if_true: ...). > > While touching the array, remove the useless dependency of the curl > module on glib. glib is always linked in QEMU and in fact all other > block modules also need it, but they don't have to specify it. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
diff --git a/block/meson.build b/block/meson.build index e687c54dbc..9e3388f633 100644 --- a/block/meson.build +++ b/block/meson.build @@ -71,19 +71,19 @@ block_modules = {} modsrc = [] foreach m : [ - [curl, 'curl', [curl, glib], 'curl.c'], - [glusterfs, 'gluster', glusterfs, 'gluster.c'], - [libiscsi, 'iscsi', libiscsi, 'iscsi.c'], - [libnfs, 'nfs', libnfs, 'nfs.c'], - [libssh, 'ssh', libssh, 'ssh.c'], - [rbd, 'rbd', rbd, 'rbd.c'], + [curl, 'curl', files('curl.c')], + [glusterfs, 'gluster', files('gluster.c')], + [libiscsi, 'iscsi', files('iscsi.c')], + [libnfs, 'nfs', files('nfs.c')], + [libssh, 'ssh', files('ssh.c')], + [rbd, 'rbd', files('rbd.c')], ] if m[0].found() + module_ss = ss.source_set() + module_ss.add(when: m[0], if_true: m[2]) if enable_modules - modsrc += files(m[3]) + modsrc += module_ss.all_sources() endif - module_ss = ss.source_set() - module_ss.add(when: m[2], if_true: files(m[3])) block_modules += {m[1] : module_ss} endif endforeach
Right now all dependencies for block modules are passed to module_ss.add(when: ...), so they are mandatory. In the next patch we will need to add a libm dependency to a module, but libm does not exist on all systems. So, modify the creation of module_ss and modsrc so that dependencies can also be passed to module_ss.add(if_true: ...). While touching the array, remove the useless dependency of the curl module on glib. glib is always linked in QEMU and in fact all other block modules also need it, but they don't have to specify it. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- block/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)