Skip to contentSkip to conversation

meson: Declare have_virtfs_proxy_helper in main meson.build

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Jan 20, 2021 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

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".

---
 meson.build       | 2 ++
 fsdev/meson.build | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
meson.build +2 -0
index 3d889857a09..8f5a8b997d3 100644
@@ -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
index 65455a179e5..adf57cc43ed 100644
@@ -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
#1 lore raw
Quoted 30 lines · Philippe Mathieu-Daudé

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".

---
  meson.build       | 2 ++
  fsdev/meson.build | 1 -
  2 files changed, 2 insertions(+), 1 deletion(-)
meson.build +2 -0
index 3d889857a09..8f5a8b997d3 100644
@@ -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
index 65455a179e5..adf57cc43ed 100644

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