sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

build: drop --with-libcephfs=<path> support

Browse Source 
--with-libcephfs=<path> provides a mechanism for explicitly specifying
header and library paths for Ceph. This adds unnecessary complexity and
can be achieved using generic compiler environment variables (e.g.
GCC LIBRARY_PATH and C_INCLUDE_PATH), so drop --with-libcephfs support.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
David Disseldorp 2019-06-18 14:35:02 +02:00 committed by Andrew Bartlett
parent b76bf7afd0
commit dfa4dcf386
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ctdb/wscript
View File

@ -254,14 +254,12 @@ def configure(conf):
Logs.info('Building with etcd support')
conf.env.etcd_reclock = have_etcd_reclock
if Options.options.ctdb_ceph_reclock:
# Use custom libcephfs library path if provided. XXX The top level build
# explicitly sets LIBPATH_CEPH-COMMON when libcephfs_dir isn't provided.
if Options.options.libcephfs_dir:
conf.env['CPPPATH_RADOS'] = Options.options.libcephfs_dir + '/include'
conf.env['LIBPATH_RADOS'] = Options.options.libcephfs_dir + '/lib'
conf.env['LIBPATH_CEPH-COMMON'] = conf.env['LIBPATH_RADOS'] + '/ceph'
if Options.options.libcephfs_dir:
Logs.error('''--with-libcephfs no longer supported, please use compiler
flags instead, e.g. GCC LIBRARY_PATH and C_INCLUDE_PATH''')
sys.exit(1)
if Options.options.ctdb_ceph_reclock:
if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and
conf.CHECK_LIB('rados', shlib=True)):
conf.CHECK_LIB('ceph-common', shlib=True)
@ -682,13 +680,10 @@ def build(bld):
destname='README')
if bld.env.HAVE_LIBRADOS:
rados_inc = ' include'
if bld.CONFIG_GET('CPPPATH_RADOS') is not None:
rados_inc = bld.CONFIG_GET('CPPPATH_RADOS') + rados_inc
bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',
source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',
deps='talloc tevent rados ceph-common',
includes=rados_inc,
includes='include',
install_path='${CTDB_HELPER_BINDIR}')
sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR)

9
source3/wscript
View File

@ -1554,15 +1554,14 @@ main() {
conf.env['CFLAGS_CEPHFS'] = "-D_FILE_OFFSET_BITS=64"
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'
else:
conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph'
Logs.error('''--with-libcephfs no longer supported, please use compiler
flags instead, e.g. GCC LIBRARY_PATH and C_INCLUDE_PATH''')
sys.exit(1)
if (Options.options.with_cephfs and
conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
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:
conf.DEFINE('HAVE_CEPH', '1')