From c71181b66674f6bef67576137d285162f1bc6a6d Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Fri, 3 Dec 2021 14:06:54 +0100 Subject: [PATCH] meson: Improve network driver enablement logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Homebrew package explicitly enables this driver despite us disabling it by default on macOS, so it must be functional to at least some extent and certainly can't be causing any build failures. Additionally, if the user has explicitly asked for the network driver to be enabled but libvirtd is disabled for whatever reason, we should error out instead of silently disabling the network driver. Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index ba2f0d21de..cea8bbfa0c 100644 --- a/meson.build +++ b/meson.build @@ -1645,10 +1645,10 @@ if not get_option('driver_ch').disabled() and host_machine.system() == 'linux' a endif endif -# there's no use compiling the network driver without the libvirt -# daemon, nor compiling it for macOS, where it breaks the compile -if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') and host_machine.system() != 'darwin' +if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') conf.set('WITH_NETWORK', 1) +elif get_option('driver_network').enabled() + error('libvirtd must be enabled to build the network driver') endif if udev_dep.found() and conf.has('WITH_LIBVIRTD')