The branch, v4-6-test has been updated
via 666c680 build: fix ceph_statx check when configured with
libcephfs_dir
from 3015558 vfs_fruit: set delete-on-close for empty finderinfo
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test
- Log -----------------------------------------------------------------
commit 666c6802cbe148356b1b2b19893ce43d3521343a
Author: David Disseldorp <dd...@suse.de>
Date: Thu Jul 20 11:10:57 2017 +0200
build: fix ceph_statx check when configured with libcephfs_dir
When configured with a custom libcephfs_dir, the ceph_statx check fails
to link. This is due to the location of the ceph-common dependency,
which is installed under a ceph subdirectory.
ceph/build > make DESTDIR=./inst install
...
ceph/build > find inst/|grep -e /libcephfs -e /libceph-common
inst/usr/local/lib64/ceph/libceph-common.so.0
inst/usr/local/lib64/ceph/libceph-common.so
inst/usr/local/lib64/libcephfs.so.2.0.0
inst/usr/local/lib64/libcephfs.so.2
inst/usr/local/lib64/libcephfs.so
inst/usr/local/include/cephfs/libcephfs.h
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13250
Signed-off-by: David Disseldorp <dd...@suse.de>
Reviewed-by: Jeff Layton <jlay...@samba.org>
(cherry picked from commit ff7df3d3f5259362a6bb6780d6b532e57e89681d)
Autobuild-User(v4-6-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-6-test): Tue Feb 13 13:36:13 CET 2018 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/wscript | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index 33eb599..06fbf8c 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1578,11 +1578,16 @@ main() {
if Options.options.libcephfs_dir:
conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include'
conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib'
+ conf.env['LIBPATH_CEPH-COMMON'] = Options.options.libcephfs_dir +
'/lib/ceph'
- if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
conf.CHECK_LIB('cephfs', shlib=True) and Options.options.with_cephfs:
+ if (Options.options.with_cephfs and
+ conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
+ conf.CHECK_LIB('cephfs', shlib=True) and
+ conf.CHECK_LIB('ceph-common', shlib=True)):
if Options.options.with_acl_support:
conf.DEFINE('HAVE_CEPH', '1')
- if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs',
headers='cephfs/libcephfs.h'):
+ if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs ceph-common',
+ headers='cephfs/libcephfs.h'):
conf.DEFINE('HAVE_CEPH_STATX', '1')
else:
Logs.warn("ceph support disabled due to --without-acl-support")
--
Samba Shared Repository
