* [PATCH] meson: Declare have_virtfs_proxy_helper in main meson.build
@ 2021-01-20 15:15 Philippe Mathieu-Daudé
2021-01-20 16:56 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-20 15:15 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Christian Schoenebeck, Greg Kurz,
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".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 2 ++
fsdev/meson.build | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3d889857a09..8f5a8b997d3 100644
--- a/meson.build
+++ b/meson.build
@@ -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'
diff --git a/fsdev/meson.build b/fsdev/meson.build
index 65455a179e5..adf57cc43ed 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -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'),
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] meson: Declare have_virtfs_proxy_helper in main meson.build
2021-01-20 15:15 [PATCH] meson: Declare have_virtfs_proxy_helper in main meson.build Philippe Mathieu-Daudé
@ 2021-01-20 16:56 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2021-01-20 16:56 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Christian Schoenebeck, Greg Kurz
On 20/01/21 16:15, Philippe Mathieu-Daudé wrote:
> 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>
> ---
> meson.build | 2 ++
> fsdev/meson.build | 1 -
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 3d889857a09..8f5a8b997d3 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -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'
> diff --git a/fsdev/meson.build b/fsdev/meson.build
> index 65455a179e5..adf57cc43ed 100644
> --- a/fsdev/meson.build
> +++ b/fsdev/meson.build
> @@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-20 16:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-20 15:15 [PATCH] meson: Declare have_virtfs_proxy_helper in main meson.build Philippe Mathieu-Daudé
2021-01-20 16:56 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).