From c0dff1a1ddaad1869fd2d9956d836f1d37ac115c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Thu, 15 Feb 2018 16:23:58 +0100 Subject: [PATCH] More fixes for libceph-common detection Guenther --- samba-4.8.0-ceph.patch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/samba-4.8.0-ceph.patch b/samba-4.8.0-ceph.patch index d479d2b..515444a 100644 --- a/samba-4.8.0-ceph.patch +++ b/samba-4.8.0-ceph.patch @@ -1,4 +1,4 @@ -From ebae8df5e4b955f235cdeb629e99d32d35766d65 Mon Sep 17 00:00:00 2001 +From 73f077204f70a157c3e1b3c63996ac29b005ea5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Mon, 15 Jan 2018 23:20:39 +0100 Subject: [PATCH] FIXME: build: fix libceph-common detection @@ -7,14 +7,14 @@ Guenther Signed-off-by: Guenther Deschner --- - source3/wscript | 2 ++ - 1 file changed, 2 insertions(+) + source3/wscript | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source3/wscript b/source3/wscript -index 0f8fe5452da..4eba0103be8 100644 +index 6d2d94bae87..48a9271f002 100644 --- a/source3/wscript +++ b/source3/wscript -@@ -1540,6 +1540,8 @@ main() { +@@ -1547,11 +1547,13 @@ main() { 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' @@ -23,6 +23,13 @@ index 0f8fe5452da..4eba0103be8 100644 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)): ++ conf.CHECK_LIB('cephfs', shlib=True)): ++ 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 ceph-common', -- 2.14.3