[Pkg-samba-maint] [samba] 03/03: Disable socketwrapper.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch experimental
in repository samba.

commit 8874bd7770285dbe22f835fc6bd33943ae5ad0bb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Sep 28 01:23:13 2015 +0000

    Disable socketwrapper.
---
 ctdb/wscript                              |  6 ++++--
 debian/patches/disable-socketwrapper.diff | 24 ++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ctdb/wscript b/ctdb/wscript
index 06f86a3..055c853 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')
@@ -256,7 +257,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
diff --git a/debian/patches/disable-socketwrapper.diff b/debian/patches/disable-socketwrapper.diff
new file mode 100644
index 0000000..e57694a
--- /dev/null
+++ b/debian/patches/disable-socketwrapper.diff
@@ -0,0 +1,24 @@
+diff --git a/ctdb/wscript b/ctdb/wscript
+index 06f86a3..055c853 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')
+@@ -256,7 +257,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
diff --git a/debian/patches/series b/debian/patches/series
index 2c9d5a8..8c53e0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ xsltproc_dont_build_smb.conf.5.patch
 heimdal-rfc3454.txt
 Fix-privacy-breach-on-google.com.patch
 fix-cluster-build.diff
+disable-socketwrapper.diff

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