On Fri, Apr 16, 2021 at 09:12:45PM +0200, Pavel Hrdina wrote:
> These binaries are used only during runtime so technically there is no
> need to check for them while compiling libvirt.
>
> Usually the location is the same while compiling and running but it may
> not be true. In addition they are not strictly required to compile the
> code so this way developers don't have to install it or create fake
> binaries in order to compile the code.
>
> Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
> ---
> meson.build | 170 ++-----------------------
> src/bhyve/bhyve_command.c | 4 +
> src/locking/lock_driver_lockd.c | 12 +-
> src/network/bridge_driver.c | 2 +
> src/node_device/node_device_driver.c | 2 +
> src/qemu/qemu_conf.c | 5 +
> src/storage/storage_backend_logical.c | 13 ++
> src/storage/storage_backend_sheepdog.c | 2 +
> src/storage/storage_backend_zfs.c | 3 +
> src/storage/storage_util.c | 2 +
> src/storage/storage_util.h | 6 +
> src/util/virdnsmasq.c | 1 +
> src/util/virfirewall.h | 4 +
> src/util/viriscsi.h | 2 +
> src/util/virkmod.h | 3 +
> src/util/virnetdevbandwidth.h | 2 +
> src/util/virnetdevip.c | 2 +
> src/util/virnetdevmidonet.c | 2 +
> src/util/virnetdevopenvswitch.c | 2 +
> src/util/virnuma.c | 1 +
> src/util/virsysinfo.c | 1 +
> src/util/virutil.c | 2 +
> 22 files changed, 72 insertions(+), 171 deletions(-)
>
> @@ -1865,11 +1763,9 @@ if conf.has('WITH_LIBVIRTD')
> error('Need glusterfs (libgfapi) for gluster storage driver')
> endif
>
> - if not get_option('storage_iscsi').disabled() and iscsiadm_prog.found()
> + if not get_option('storage_iscsi').disabled()
> use_storage = true
> conf.set('WITH_STORAGE_ISCSI', 1)
So this now enables iSCSI even on platforms which don't support iscsiadm
tools.
> - elif get_option('storage_iscsi').enabled()
> - error('We need iscsiadm for iSCSI storage driver')
> endif
>
> if not get_option('storage_iscsi_direct').disabled() and libiscsi_dep.found()
> @@ -1880,31 +1776,8 @@ if conf.has('WITH_LIBVIRTD')
> endif
>
> if not get_option('storage_lvm').disabled()
snip
> + use_storage = true
> + conf.set('WITH_STORAGE_LVM', 1)
And enables LVM on all platforms, even though this is Linux only..
Overall this patch makes it so that our meson rules don't
"do the right thing" as a default behaviour, and just enable
everything whether you have it installed or not.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
