[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 52/55] libattr: convert to meson
From: |
Paolo Bonzini |
Subject: |
[PULL 52/55] libattr: convert to meson |
Date: |
Mon, 21 Dec 2020 15:44:44 +0100 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 45 ++++-----------------------------------------
meson.build | 38 +++++++++++++++++++++++++++++++++++---
meson_options.txt | 2 ++
3 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/configure b/configure
index 569396248b..18af62a3e0 100755
--- a/configure
+++ b/configure
@@ -331,8 +331,7 @@ xen_pci_passthrough="auto"
linux_aio="$default_feature"
linux_io_uring="$default_feature"
cap_ng="auto"
-attr="$default_feature"
-libattr="$default_feature"
+attr="auto"
xfs="$default_feature"
tcg="enabled"
membarrier="$default_feature"
@@ -1229,9 +1228,9 @@ for opt do
;;
--enable-linux-io-uring) linux_io_uring="yes"
;;
- --disable-attr) attr="no"
+ --disable-attr) attr="disabled"
;;
- --enable-attr) attr="yes"
+ --enable-attr) attr="enabled"
;;
--disable-membarrier) membarrier="no"
;;
@@ -3542,36 +3541,6 @@ elif test "$tpm" = "yes"; then
fi
fi
-##########################################
-# attr probe
-
-libattr_libs=
-if test "$attr" != "no" ; then
- cat > $TMPC <<EOF
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef CONFIG_LIBATTR
-#include <attr/xattr.h>
-#else
-#include <sys/xattr.h>
-#endif
-int main(void) { getxattr(NULL, NULL, NULL, 0); setxattr(NULL, NULL, NULL, 0,
0); return 0; }
-EOF
- if compile_prog "" "" ; then
- attr=yes
- # Older distros have <attr/xattr.h>, and need -lattr:
- elif compile_prog "-DCONFIG_LIBATTR" "-lattr" ; then
- attr=yes
- libattr_libs="-lattr"
- libattr=yes
- else
- if test "$attr" = "yes" ; then
- feature_not_found "ATTR" "Install libc6 or libattr devel"
- fi
- attr=no
- fi
-fi
-
##########################################
# iovec probe
cat > $TMPC <<EOF
@@ -5866,13 +5835,6 @@ if test "$linux_io_uring" = "yes" ; then
echo "LINUX_IO_URING_CFLAGS=$linux_io_uring_cflags" >> $config_host_mak
echo "LINUX_IO_URING_LIBS=$linux_io_uring_libs" >> $config_host_mak
fi
-if test "$attr" = "yes" ; then
- echo "CONFIG_ATTR=y" >> $config_host_mak
- echo "LIBATTR_LIBS=$libattr_libs" >> $config_host_mak
-fi
-if test "$libattr" = "yes" ; then
- echo "CONFIG_LIBATTR=y" >> $config_host_mak
-fi
if test "$vhost_scsi" = "yes" ; then
echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
fi
@@ -6534,6 +6496,7 @@ NINJA=$ninja $meson setup \
-Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
-Dlibssh=$libssh -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse
\
-Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
+ -Dattr=$attr \
-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
-Dvhost_user_blk_server=$vhost_user_blk_server \
-Dfuse=$fuse -Dfuse_lseek=$fuse_lseek \
diff --git a/meson.build b/meson.build
index f580f2f67f..fef0c0f013 100644
--- a/meson.build
+++ b/meson.build
@@ -324,10 +324,40 @@ if not get_option('libnfs').auto() or have_block
required: get_option('libnfs'),
method: 'pkg-config', static: enable_static)
endif
+
+libattr_test = '''
+ #include <stddef.h>
+ #include <sys/types.h>
+ #ifdef CONFIG_LIBATTR
+ #include <attr/xattr.h>
+ #else
+ #include <sys/xattr.h>
+ #endif
+ int main(void) { getxattr(NULL, NULL, NULL, 0); setxattr(NULL, NULL, NULL,
0, 0); return 0; }'''
+
libattr = not_found
-if 'CONFIG_ATTR' in config_host
- libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split())
+have_old_libattr = false
+if not get_option('attr').disabled()
+ if cc.links(libattr_test)
+ libattr = declare_dependency()
+ else
+ libattr = cc.find_library('attr', has_headers: ['attr/xattr.h'],
+ required: get_option('attr'),
+ static: enable_static)
+ if libattr.found() and not \
+ cc.links(libattr_test, dependencies: libattr, args: '-DCONFIG_LIBATTR')
+ libattr = not_found
+ if get_option('attr').enabled()
+ error('could not link libattr')
+ else
+ warning('could not link libattr, disabling')
+ endif
+ else
+ have_old_libattr = libattr.found()
+ endif
+ endif
endif
+
seccomp = not_found
if not get_option('libiscsi').auto() or have_system or have_tools
seccomp = dependency('libseccomp', version: '>=2.3.0',
@@ -1010,6 +1040,7 @@ config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR',
get_option('prefix') /
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') /
qemu_moddir)
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') /
get_option('sysconfdir'))
+config_host_data.set('CONFIG_ATTR', libattr.found())
config_host_data.set('CONFIG_BRLAPI', brlapi.found())
config_host_data.set('CONFIG_COCOA', cocoa.found())
config_host_data.set('CONFIG_LIBUDEV', libudev.found())
@@ -1027,6 +1058,7 @@ if glusterfs.found()
config_host_data.set('CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT',
glusterfs_ftruncate_has_stat)
config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT',
glusterfs_iocb_has_stat)
endif
+config_host_data.set('CONFIG_LIBATTR', have_old_libattr)
config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found())
config_host_data.set('CONFIG_LIBISCSI', libiscsi.found())
config_host_data.set('CONFIG_LIBNFS', libnfs.found())
@@ -2350,7 +2382,7 @@ summary_info += {'vde support':
config_host.has_key('CONFIG_VDE')}
summary_info += {'netmap support': config_host.has_key('CONFIG_NETMAP')}
summary_info += {'Linux AIO support': config_host.has_key('CONFIG_LINUX_AIO')}
summary_info += {'Linux io_uring support':
config_host.has_key('CONFIG_LINUX_IO_URING')}
-summary_info += {'ATTR/XATTR support': config_host.has_key('CONFIG_ATTR')}
+summary_info += {'ATTR/XATTR support': libattr.found()}
summary_info += {'Install blobs': get_option('install_blobs')}
summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')}
summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')}
diff --git a/meson_options.txt b/meson_options.txt
index 12a1872f20..8fcec056cd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,6 +40,8 @@ option('cfi', type: 'boolean', value: 'false',
option('cfi_debug', type: 'boolean', value: 'false',
description: 'Verbose errors in case of CFI violation')
+option('attr', type : 'feature', value : 'auto',
+ description: 'attr/xattr support')
option('brlapi', type : 'feature', value : 'auto',
description: 'brlapi character device driver')
option('bzip2', type : 'feature', value : 'auto',
--
2.29.2
- [PULL 09/55] tests/docker: Remove the remainders of debian9 containers from the Makefile, (continued)
- [PULL 09/55] tests/docker: Remove the remainders of debian9 containers from the Makefile, Paolo Bonzini, 2020/12/21
- [PULL 23/55] util: Extract flush_icache_range to cacheflush.c, Paolo Bonzini, 2020/12/21
- [PULL 34/55] configure: accept --enable-slirp, Paolo Bonzini, 2020/12/21
- [PULL 28/55] meson: fix detection of curses with pkgconfig, Paolo Bonzini, 2020/12/21
- [PULL 26/55] meson: update submodule to 0.56.0, Paolo Bonzini, 2020/12/21
- [PULL 22/55] remove TCG includes from common code, Paolo Bonzini, 2020/12/21
- [PULL 41/55] libiscsi: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 42/55] libnfs: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 45/55] lzo: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 53/55] meson.build: convert --with-default-devices to meson, Paolo Bonzini, 2020/12/21
- [PULL 52/55] libattr: convert to meson,
Paolo Bonzini <=
- [PULL 54/55] configure: move tests/qemu-iotests/common.env generation to meson, Paolo Bonzini, 2020/12/21
- [PULL 46/55] snappy: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 51/55] cap_ng: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 44/55] rbd: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 47/55] lzfse: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 49/55] seccomp: convert to meson, Paolo Bonzini, 2020/12/21