From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 4 Apr 2022 12:56:59 +0200 Subject: [PATCH] also build virtfs-proxy-helper The Gentoo ebuild splits the qemu build into a softmmu, user and tool phase in order to be able to build and link some of the qemu emulators statically. This unfortunately has the consequence that we never configure with "have_virtfs" and "have_tools" at the same time. As a workaround, simply build the virtfs userland unconditionally. After all, it is a tiny executable --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 063c736aee..fda8639293 100644 --- a/meson.build +++ b/meson.build @@ -2008,8 +2008,6 @@ have_virtfs = get_option('virtfs') \ .allowed() have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \ - .require(targetos != 'darwin', error_message: 'the virtfs proxy helper is incompatible with macOS') \ - .require(have_virtfs, error_message: 'the virtfs proxy helper requires that virtfs is enabled') \ .disable_auto_if(not have_tools) \ .require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \ .allowed() -- 2.35.1