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

ctdb/build: fix ctdb_mutex_ceph_rados_helper builds

Browse Source 
2b5dbb3525 fixed builds with an explicit
--with-libcephfs but broke builds against system Ceph libraries. This
change handles both cases.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu May  9 04:24:56 UTC 2019 on sn-devel-184
This commit is contained in:
David Disseldorp 2019-04-18 20:14:31 +02:00 committed by Martin Schwenke
parent ae9fb93393
commit 04c0e5212d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/wscript
View File

@ -680,10 +680,13 @@ def build(bld):
destname='README') destname='README')
if bld.env.HAVE_LIBRADOS: 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', 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 ceph-common',
includes=bld.CONFIG_GET('CPPPATH_RADOS'), includes=rados_inc,
install_path='${CTDB_HELPER_BINDIR}') install_path='${CTDB_HELPER_BINDIR}')
sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR) sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR)