meson: Declare have_virtfs_proxy_helper in main meson.build
PATCH 1/1 meson: Declare have_virtfs_proxy_helper in main meson.build
have_virtfs_proxy_helper is used from docs/meson.build, and can be not declared when including it before fsdev/meson.build. This fixes:
../docs/meson.build:54:2: ERROR: Unknown variable "have_virtfs_proxy_helper".
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
--- meson.build | 2 ++ fsdev/meson.build | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
meson.build +2 -0
@@ -1032,6 +1032,8 @@ libattr.found() and libcap_ng.found()) +have_virtfs_proxy_helper = have_virtfs and have_tools + if get_option('virtfs').enabled() if not have_virtfs if targetos != 'linux'
fsdev/meson.build +0 -1
@@ -8,7 +8,6 @@ ), if_false: files('qemu-fsdev-dummy.c')) softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) -have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and have_virtfs if have_virtfs_proxy_helper executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),
Signature · 1 line
2.26.2
Paolo Bonzini
AppliedQuoted 30 lines · Philippe Mathieu-Daudé
have_virtfs_proxy_helperis used from docs/meson.build, and can be not declared when including it before fsdev/meson.build. This fixes:../docs/meson.build:54:2: ERROR: Unknown variable "
have_virtfs_proxy_helper".Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- meson.build | 2 ++ fsdev/meson.build | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)meson.build +2
-0@@ -1032,6 +1032,8 @@ libattr.found() and libcap_ng.found()) +have_virtfs_proxy_helper = have_virtfs and have_tools + if get_option('virtfs').enabled() if not have_virtfs if targetos != 'linux'fsdev/meson.build +0
-0
fsdev/meson.build line 13
Quoted 7 lines
fsdev/meson.build +0
-1@@ -8,7 +8,6 @@ ), if_false: files('qemu-fsdev-dummy.c')) softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) -have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and have_virtfs if have_virtfs_proxy_helper executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),
Queued, thanks.
Paolo