[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Mon Sep 2 03:45:03 UTC 2019


The branch, master has been updated
       via  16c3a00d2eb build: remove unneeded libceph-common dependency
       via  dfa4dcf386f build: drop --with-libcephfs=<path> support
      from  b76bf7afd07 build: Raise minimum python version to 3.5.0 for Samba 4.12

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 16c3a00d2eb8471dfa4cf9ace003578331d2e1e0
Author: Björn Baumbach <bb at sernet.de>
Date:   Thu Jun 13 17:20:02 2019 +0200

    build: remove unneeded libceph-common dependency
    
    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 at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Mon Sep  2 03:44:24 UTC 2019 on sn-devel-184

commit dfa4dcf386febdf1b77ba963f11bcc2a44f8a738
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue Jun 18 14:35:02 2019 +0200

    build: drop --with-libcephfs=<path> support
    
    --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 at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/wscript    | 20 +++++++-------------
 source3/wscript | 11 ++++-------
 2 files changed, 11 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index 45207d5548a..c67725204a2 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -254,17 +254,14 @@ 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)
             Logs.info('Building with Ceph librados recovery lock support')
             conf.define('HAVE_LIBRADOS', 1)
         else:
@@ -682,13 +679,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,
+			 deps='talloc tevent rados',
+			 includes='include',
 			 install_path='${CTDB_HELPER_BINDIR}')
 
     sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g'  % (bld.env.CTDB_VARDIR)
diff --git a/source3/wscript b/source3/wscript
index 3118abd738b..1dc5abf0ab6 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1554,19 +1554,16 @@ 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.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',
+            if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs',
                                    headers='cephfs/libcephfs.h'):
                 conf.DEFINE('HAVE_CEPH_STATX', '1')
         else:


-- 
Samba Shared Repository



More information about the samba-cvs mailing list