OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: Declare have_virtfs_proxy_helper in main meson.build

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2021-01-20 16:15:39 +01:00 committed by Paolo Bonzini
parent 0ba781957e
commit 3a489d38fd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fsdev/meson.build
View File

@ -8,7 +8,6 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
), if_false: files('qemu-fsdev-dummy.c')) ), if_false: files('qemu-fsdev-dummy.c'))
softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) 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 if have_virtfs_proxy_helper
executable('virtfs-proxy-helper', executable('virtfs-proxy-helper',
files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'), files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),

2
meson.build
View File

@ -1034,6 +1034,8 @@ have_virtfs = (targetos == 'linux' and
libattr.found() and libattr.found() and
libcap_ng.found()) libcap_ng.found())
have_virtfs_proxy_helper = have_virtfs and have_tools
if get_option('virtfs').enabled() if get_option('virtfs').enabled()
if not have_virtfs if not have_virtfs
if targetos != 'linux' if targetos != 'linux'