[SCM] Samba Shared Repository - branch master updated

Ralph Böhme slow at samba.org
Fri Jun 23 23:21:04 UTC 2017


The branch, master has been updated
       via  06cdf8d build: fix build of vfs_posix_eadb module
       via  3a17583 waf:lib/replace: Fix building with older GCC versions
      from  1f0be3e s4:torture: Do not segfault in torture_rpc_spoolss_printer_teardown_common()

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


- Log -----------------------------------------------------------------
commit 06cdf8d7c4402b52aa27631a5556dde0b22d9487
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jun 20 16:47:57 2017 +0200

    build: fix build of vfs_posix_eadb module
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Sat Jun 24 01:20:16 CEST 2017 on sn-devel-144

commit 3a175830e579ab10231439657b23733338cd5634
Author: Björn Baumbach <bb at sernet.de>
Date:   Thu Jun 22 16:07:27 2017 +0200

    waf:lib/replace: Fix building with older GCC versions
    
    Using gcc 4.3.2:
    cc1: error: unrecognized command line option "-Wno-format-truncation"
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 lib/replace/wscript | 8 +++++++-
 source3/wscript     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 33f49eb..7c50e1d 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -81,6 +81,9 @@ def configure(conf):
     conf.CHECK_HEADERS('sys/atomic.h')
     conf.CHECK_HEADERS('libgen.h')
 
+    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
+        conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
+
     # Check for process set name support
     conf.CHECK_CODE('''
                     #include <sys/prctl.h>
@@ -711,11 +714,14 @@ def build(bld):
                       private_library=True,
                       deps='crypt dl nsl socket rt attr' + extra_libs)
 
+    replace_test_cflags="-Wno-format-zero-length"
+    if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):
+        replace_test_cflags += " -Wno-format-truncation"
     bld.SAMBA_SUBSYSTEM('replace-test',
                         source='''test/testsuite.c test/strptime.c
                         test/os2_delete.c test/getifaddrs.c''',
                         deps='replace',
-                        cflags="-Wno-format-zero-length -Wno-format-truncation")
+                        cflags=replace_test_cflags)
 
     if bld.env.standalone_replace:
         bld.SAMBA_BINARY('replace_testsuite',
diff --git a/source3/wscript b/source3/wscript
index 5a3749c..8fa51fb 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1706,7 +1706,7 @@ main() {
 
     if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
         default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4'))
-        default_shared_modules.extend('vfs_posix_eadb')
+        default_shared_modules.extend(TO_LIST('vfs_posix_eadb'))
 
     if conf.CONFIG_SET('HAVE_FREEBSD_SUNACL_H'):
         default_shared_modules.extend(TO_LIST('vfs_zfsacl'))


-- 
Samba Shared Repository



More information about the samba-cvs mailing list