Attachment 8141 Details for Bug 9351 – Fix for bug 9351

[patch] Fix for bug 9351

build-waf-Fail-configure-with-ctdb.patch (text/plain), 2.52 KB, created by Björn Baumbach on 2012-11-02 15:07:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2012-11-02 15:07:44 UTC

Size: 2.52 KB

patch

obsolete

>From a24a0482bcf0640388fe8476878e534d497b73c3 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Tue, 30 Oct 2012 16:04:10 +0100
>Subject: [PATCH] build(waf): Fail "configure --with-cluster-support" if ctdb
> support is not available.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Currently, configure only warns if cluster support is not found.
>
>Fix for bug #9351
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit d551b4ab4bb06dac7d90389febbc21c2afae8bca)
>---
> source3/wscript |   16 ++++++++++------
> 1 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index c6b6075..4ef1a38 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -43,7 +43,7 @@ def set_options(opt):
>     opt.SAMBA3_ADD_OPTION('aio-support')
>     opt.SAMBA3_ADD_OPTION('profiling-data', default=False)
> 
>-    opt.SAMBA3_ADD_OPTION('cluster-support')
>+    opt.SAMBA3_ADD_OPTION('cluster-support', default=None)
> 
>     opt.add_option('--with-ctdb-dir',
>                    help=("Directory under which ctdb is installed"),
>@@ -1292,7 +1292,9 @@ main() {
>     #
>     # checking for clustering extensions (CTDB)
>     #
>-    if not Options.options.with_cluster_support:
>+    if Options.options.with_cluster_support == False:
>+        # configure is called with --without-cluster-support,
>+        # so don't check for and build w/o ctdb support.
>         have_cluster_support = False
> 
>     else:
>@@ -1520,14 +1522,16 @@ main() {
>         Logs.info("building with cluster support")
>         conf.DEFINE('CLUSTER_SUPPORT', 1);
>     else:
>-        if not Options.options.with_cluster_support:
>-            Logs.info("building without cluster support")
>+        if Options.options.with_cluster_support == False:
>+            Logs.info("building without cluster support (--without-cluster-support)")
>+        elif Options.options.with_cluster_support == True:
>+            Logs.error("Cluster support not available: " + ctdb_broken)
>+            conf.fatal("Cluster support not found, but --with-cluster-support was specified")
>         else:
>-            Logs.warn("building without cluster support: " + ctdb_broken)
>+            Logs.info("building without cluster support: " + ctdb_broken)
>         conf.undefine('CLUSTER_SUPPORT')
> 
> 
>-
>     conf.CHECK_CODE('__attribute__((destructor)) static void cleanup(void) { }',
>                     'HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR',
>                     addmain=False,
>-- 
>1.7.8.6
>

Flags:

obnox: review+
vl: review+

Actions: View

Attachments on bug 9351: 8141