sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

build: remove unneeded libceph-common dependency

Browse Source 
librados and libcephfs are both dependent on ceph-common, but
ctdb_mutex_ceph_rados_helper and vfs_ceph needn't be explicitly linked
against it.

Signed-off-by: Björn Baumbach <bb@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Sep  2 03:44:24 UTC 2019 on sn-devel-184
This commit is contained in:
Björn Baumbach 2019-06-13 17:20:02 +02:00 committed by Andrew Bartlett
parent dfa4dcf386
commit 16c3a00d2e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctdb/wscript
View File

@ -262,7 +262,6 @@ def configure(conf):
if Options.options.ctdb_ceph_reclock: if Options.options.ctdb_ceph_reclock:
if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and
conf.CHECK_LIB('rados', shlib=True)): conf.CHECK_LIB('rados', shlib=True)):
conf.CHECK_LIB('ceph-common', shlib=True)
Logs.info('Building with Ceph librados recovery lock support') Logs.info('Building with Ceph librados recovery lock support')
conf.define('HAVE_LIBRADOS', 1) conf.define('HAVE_LIBRADOS', 1)
else: else:
@ -682,7 +681,7 @@ def build(bld):
if bld.env.HAVE_LIBRADOS: if bld.env.HAVE_LIBRADOS:
bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper', bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',
source='utils/ceph/ctdb_mutex_ceph_rados_helper.c', source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',
deps='talloc tevent rados ceph-common', deps='talloc tevent rados',
includes='include', includes='include',
install_path='${CTDB_HELPER_BINDIR}') install_path='${CTDB_HELPER_BINDIR}')

4
source3/wscript
View File

@ -1561,11 +1561,9 @@ main() {
if (Options.options.with_cephfs and if (Options.options.with_cephfs and
conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
conf.CHECK_LIB('cephfs', shlib=True)): conf.CHECK_LIB('cephfs', shlib=True)):
conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph'
conf.CHECK_LIB('ceph-common', shlib=True)
if Options.options.with_acl_support: if Options.options.with_acl_support:
conf.DEFINE('HAVE_CEPH', '1') conf.DEFINE('HAVE_CEPH', '1')
if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs ceph-common', if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs',
headers='cephfs/libcephfs.h'): headers='cephfs/libcephfs.h'):
conf.DEFINE('HAVE_CEPH_STATX', '1') conf.DEFINE('HAVE_CEPH_STATX', '1')
else: else: