diff mbox series

[PULL,12/31] meson: Declare have_virtfs_proxy_helper in main meson.build

Message ID 20210123143128.1167797-13-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show
Series [PULL,01/31] runstate: cleanup reboot and panic actions | expand

Commit Message

Paolo Bonzini Jan. 23, 2021, 2:31 p.m. UTC
From: Philippe Mathieu-Daudé <philmd@redhat.com>

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é <philmd@redhat.com>
Message-Id: <20210120151539.1166252-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 fsdev/meson.build | 1 -
 meson.build       | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
diff mbox series


diff --git a/fsdev/meson.build b/fsdev/meson.build
index 65455a179e..adf57cc43e 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -8,7 +8,6 @@  fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
 ), 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
              files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),
diff --git a/meson.build b/meson.build
index deda061c86..4a5f265bd0 100644
--- a/meson.build
+++ b/meson.build
@@ -1034,6 +1034,8 @@  have_virtfs = (targetos == 'linux' and
     libattr.found() and
+have_virtfs_proxy_helper = have_virtfs and have_tools
 if get_option('virtfs').enabled()
   if not have_virtfs
     if targetos != 'linux'