[SCM] Samba Shared Repository - branch v4-10-test updated

Karolin Seeger kseeger at samba.org
Thu Sep 5 16:17:03 UTC 2019


The branch, v4-10-test has been updated
       via  2dbc9dce493 ctdb: fix compilation on systems with glibc robust mutexes
      from  7e07bc4f289 vfs_glusterfs: Use pthreadpool for scheduling aio operations

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-10-test


- Log -----------------------------------------------------------------
commit 2dbc9dce49320e4b101bb08767e52ebbc632b711
Author: Ralph Boehme <slow at samba.org>
Date:   Fri Jul 12 10:49:13 2019 +0200

    ctdb: fix compilation on systems with glibc robust mutexes
    
    On older systems like SLES 11 without POSIX robust mutexes, but with glib robust
    mutexes where all the functions are available but have a "_np" suffix,
    compilation fails in:
    
    ctdb/tests/src/test_mutex_raw.c.239.o: In function `worker':
    /root/samba-4.10.6/bin/default/../../ctdb/tests/src/test_mutex_raw.c:129: undefined reference to `pthread_mutex_consistent'
    ctdb/tests/src/test_mutex_raw.c.239.o: In function `main':
    /root/samba-4.10.6/bin/default/../../ctdb/tests/src/test_mutex_raw.c:285: undefined reference to `pthread_mutex_consistent'
    /root/samba-4.10.6/bin/default/../../ctdb/tests/src/test_mutex_raw.c:332: undefined reference to `pthread_mutexattr_setrobust'
    /root/samba-4.10.6/bin/default/../../ctdb/tests/src/test_mutex_raw.c:363: undefined reference to `pthread_mutex_consistent'
    collect2: ld returned 1 exit status
    
    This could be fixed by using libreplace system/threads.h instead of pthreads.h
    directly, but as there has been a desire to keep test_mutex_raw.c standalone and
    compilable without other external depenencies then libc and libpthread, make the
    tool developer build only. This should get the average user over the cliff.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14038
    RN: Fix compiling ctdb on older systems lacking POSIX robust mutexes
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    (cherry picked from commit f5388f97792ac2d7962950dad91aaf8ad49bceaa)
    
    Autobuild-User(v4-10-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-10-test): Thu Sep  5 16:16:18 UTC 2019 on sn-devel-144

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

Summary of changes:
 ctdb/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index dd319a3ce7b..fd615752406 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -1034,7 +1034,7 @@ def build(bld):
                               ib_deps,
                          install_path='${CTDB_TEST_LIBEXECDIR}')
 
-    if bld.env.HAVE_ROBUST_MUTEXES and sys.platform.startswith('linux'):
+    if bld.env.HAVE_ROBUST_MUTEXES and sys.platform.startswith('linux') and bld.env.DEVELOPER:
         bld.SAMBA_BINARY('test_mutex_raw',
                          source='tests/src/test_mutex_raw.c',
                          deps='pthread',


-- 
Samba Shared Repository



More information about the samba-cvs mailing list