[Pkg-samba-maint] [samba] 06/07: Reapply patches.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch jessie
in repository samba.

commit 7199e2330318309351a97a5211e6de1c6916cefe
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Sun Sep 4 14:44:14 2016 +0000

    Reapply patches.
---
 ctdb/wscript           | 8 +++++---
 lib/util/wscript_build | 5 ++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ctdb/wscript b/ctdb/wscript
index 25e311d..634193d 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -94,7 +94,8 @@ def configure(conf):
     conf.RECURSE('lib/talloc')
     conf.RECURSE('lib/tevent')
     conf.RECURSE('lib/tdb')
-    conf.RECURSE('lib/socket_wrapper')
+    if conf.CONFIG_GET('ENABLE_SELFTEST'):
+        conf.RECURSE('lib/socket_wrapper')
 
     conf.CHECK_HEADERS('sched.h')
     conf.CHECK_HEADERS('procinfo.h')
@@ -255,7 +256,8 @@ def build(bld):
     bld.RECURSE('lib/talloc')
     bld.RECURSE('lib/tevent')
     bld.RECURSE('lib/tdb')
-    bld.RECURSE('lib/socket_wrapper')
+    if bld.CONFIG_GET('ENABLE_SELFTEST'):
+        bld.RECURSE('lib/socket_wrapper')
 
     if bld.env.standalone_ctdb:
         # In a combined build is implemented, CTDB will wanted to
@@ -303,7 +305,7 @@ def build(bld):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c')
     elif sys.platform.startswith('freebsd'):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c')
-    elif sys.platform == 'kfreebsd':
+    elif sys.platform.startswith('gnukfreebsd'):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c')
     elif sys.platform == 'gnu':
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_gnu.c')
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index cb9e8e5..b8fc787 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -20,11 +20,10 @@ bld.SAMBA_SUBSYSTEM('close-low-fd',
                     deps='replace',
                     local_include=False)
 
-bld.SAMBA_LIBRARY('samba-debug',
+bld.SAMBA_SUBSYSTEM('samba-debug',
                   source='debug.c',
                   deps='replace time-basic close-low-fd talloc socket-blocking',
-                  local_include=False,
-                  private_library=True)
+                  local_include=False)
 
 bld.SAMBA_LIBRARY('socket-blocking',
                   source='blocking.c',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git