[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/31] meson: Declare have_virtfs_proxy_helper in main meson.build
From: |
Paolo Bonzini |
Subject: |
[PULL 12/31] meson: Declare have_virtfs_proxy_helper in main meson.build |
Date: |
Sat, 23 Jan 2021 09:31:09 -0500 |
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 --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
executable('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
libcap_ng.found())
+have_virtfs_proxy_helper = have_virtfs and have_tools
+
if get_option('virtfs').enabled()
if not have_virtfs
if targetos != 'linux'
--
2.26.2
- [PULL 02/31] configure: MinGW respect --bindir argument, (continued)
- [PULL 02/31] configure: MinGW respect --bindir argument, Paolo Bonzini, 2021/01/23
- [PULL 08/31] build-sys: remove unused LIBS, Paolo Bonzini, 2021/01/23
- [PULL 13/31] nsis: adjust for new MinGW paths, Paolo Bonzini, 2021/01/23
- [PULL 05/31] util/cacheflush: Fix error generated by clang, Paolo Bonzini, 2021/01/23
- [PULL 14/31] meson: convert wixl detection to Meson, Paolo Bonzini, 2021/01/23
- [PULL 03/31] x86/cpu: Use max host physical address if -cpu max option is applied, Paolo Bonzini, 2021/01/23
- [PULL 07/31] ide: atapi: check logical block address and read size (CVE-2020-29443), Paolo Bonzini, 2021/01/23
- [PULL 10/31] build-sys: add libvhost-user missing dependencies, Paolo Bonzini, 2021/01/23
- [PULL 04/31] build-system: clean up TCG/TCI configury, Paolo Bonzini, 2021/01/23
- [PULL 06/31] softmmu/physmem: Silence GCC 10 maybe-uninitialized error, Paolo Bonzini, 2021/01/23
- [PULL 12/31] meson: Declare have_virtfs_proxy_helper in main meson.build,
Paolo Bonzini <=
- [PULL 15/31] meson: Summarize information related to directories first, Paolo Bonzini, 2021/01/23
- [PULL 16/31] meson: Display host binaries information altogether, Paolo Bonzini, 2021/01/23
- [PULL 17/31] meson: Summarize overall features altogether, Paolo Bonzini, 2021/01/23
- [PULL 19/31] meson: Display accelerators and selected targets altogether, Paolo Bonzini, 2021/01/23
- [PULL 09/31] build-sys: set global arguments for cflags/ldflags, Paolo Bonzini, 2021/01/23
- [PULL 18/31] meson: Summarize compilation-related information altogether, Paolo Bonzini, 2021/01/23
- [PULL 24/31] meson.build: Detect bzip2 program, Paolo Bonzini, 2021/01/23
- [PULL 22/31] meson: Add a section header for library dependencies, Paolo Bonzini, 2021/01/23
- [PULL 25/31] acceptance: switch to QMP change-vnc-password command, Paolo Bonzini, 2021/01/23
- [PULL 26/31] hmp: remove "change vnc TARGET" command, Paolo Bonzini, 2021/01/23