| Message ID | 20230421135327.1778365-1-pefoley@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Don't require libcap-ng for virtfs support | expand |
On Friday, April 21, 2023 3:53:27 PM CEST Peter Foley wrote: > It's only required for the proxy helper. > > Signed-off-by: Peter Foley <pefoley@google.com> > --- > meson.build | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meson.build b/meson.build > index c44d05a13f..1d4888b1c0 100644 > --- a/meson.build > +++ b/meson.build > @@ -1759,12 +1759,12 @@ have_virtfs = get_option('virtfs') \ > error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ > .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'), > error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \ > - .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()), > - error_message: 'virtio-9p (virtfs) on Linux requires libcap-ng-devel and libattr-devel') \ > + .require(targetos == 'darwin' or libattr.found(), > + error_message: 'virtio-9p (virtfs) on Linux requires libattr-devel') \ > .disable_auto_if(not have_tools and not have_system) \ > .allowed() > > -have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools > +have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools and libcap_ng.found() Well, I don't know how many people actually use the 9p proxy, if at all, but don't you think there should be at least a warning or some kind of output e.g. in the configure summary that QEMU would build without 9p proxy support just because of a missing lib, instead of silently disabling it? For macOS hosts we didn't care so far, because proxy is not implemented there and probably never will. > > if get_option('block_drv_ro_whitelist') == '' > config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') >
diff --git a/meson.build b/meson.build index c44d05a13f..1d4888b1c0 100644 --- a/meson.build +++ b/meson.build @@ -1759,12 +1759,12 @@ have_virtfs = get_option('virtfs') \ error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'), error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \ - .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()), - error_message: 'virtio-9p (virtfs) on Linux requires libcap-ng-devel and libattr-devel') \ + .require(targetos == 'darwin' or libattr.found(), + error_message: 'virtio-9p (virtfs) on Linux requires libattr-devel') \ .disable_auto_if(not have_tools and not have_system) \ .allowed() -have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools +have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools and libcap_ng.found() if get_option('block_drv_ro_whitelist') == '' config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '')
It's only required for the proxy helper. Signed-off-by: Peter Foley <pefoley@google.com> --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)