[SCM] Samba Shared Repository - branch master updated

Ira Cooper ira at samba.org
Thu Mar 15 00:35:01 MDT 2012


The branch, master has been updated
       via  e64b118 s3: Update waf build to include missed dependancy on Lion.
       via  b990279 util: Add --disable-fault-handling.
      from  48c2f80 libsmbclient-raw: Install smb_composite.h.

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


- Log -----------------------------------------------------------------
commit e64b1188bc7a6e42eb4d1d91e0c2a5a8a3fc02d3
Author: Ira Cooper <ira at samba.org>
Date:   Wed Mar 14 20:43:46 2012 -0400

    s3: Update waf build to include missed dependancy on Lion.
    
    Autobuild-User: Ira Cooper <ira at samba.org>
    Autobuild-Date: Thu Mar 15 07:34:43 CET 2012 on sn-devel-104

commit b990279304b5e2b2ee0f64480cb09eda33f76beb
Author: Ira Cooper <ira at samba.org>
Date:   Wed Mar 14 12:56:02 2012 -0400

    util: Add --disable-fault-handling.
    
    On some platforms you can not debug coredumps after the default signal handler
    gets done dumping core.  This allows waf to have an option to disable our
    default signal handler.

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

Summary of changes:
 lib/util/fault.c                      |    2 ++
 lib/util/wscript                      |    3 +++
 lib/util/wscript_configure            |    3 +++
 source3/configure.in                  |    7 +++++++
 source3/lib/pthreadpool/wscript_build |    2 +-
 wscript                               |    1 +
 6 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 lib/util/wscript


Changeset truncated at 500 lines:

diff --git a/lib/util/fault.c b/lib/util/fault.c
index 7fe081d..b3527bb 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault.c
@@ -96,6 +96,7 @@ void fault_setup(void)
 	if (fault_state.disabled) {
 		return;
 	}
+#if !defined(HAVE_DISABLE_FAULT_HANDLING)
 #ifdef SIGSEGV
 	CatchSignal(SIGSEGV, sig_fault);
 #endif
@@ -105,6 +106,7 @@ void fault_setup(void)
 #ifdef SIGABRT
 	CatchSignal(SIGABRT, sig_fault);
 #endif
+#endif
 }
 
 _PUBLIC_ const char *panic_action = NULL;
diff --git a/lib/util/wscript b/lib/util/wscript
new file mode 100644
index 0000000..d296e75
--- /dev/null
+++ b/lib/util/wscript
@@ -0,0 +1,3 @@
+def set_options(opt):
+    ''' This is a bit strange, but disable is the flag, not enable. '''
+    opt.add_option('--disable-fault-handling', action='store_true', dest='disable_fault_handling', help=('disable the fault handlers'), default=False)
diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
index fdaf67a..ad55476 100644
--- a/lib/util/wscript_configure
+++ b/lib/util/wscript_configure
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
+import Options
 
+if Options.options.disable_fault_handling:
+    conf.DEFINE('HAVE_DISABLE_FAULT_HANDLING',1)
 
 # backtrace could be in libexecinfo or in libc
 conf.CHECK_FUNCS_IN('backtrace backtrace_symbols', 'execinfo', checklibc=True, headers='execinfo.h')
diff --git a/source3/configure.in b/source3/configure.in
index 611e1d8..51e163d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6799,6 +6799,7 @@ if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; t
     fi
 fi
 
+
 #################################################
 # Check to see if we should use the included iniparser
 
@@ -6834,6 +6835,12 @@ AC_SUBST(BUILD_INIPARSER)
 AC_SUBST(INIPARSERLIBS)
 AC_SUBST(FLAGS1)
 
+AC_ARG_ENABLE(fault-handler,[AS_HELP_STRING([--disable-fault-handler], [Disable the default handler])])
+
+if test x"$enable_fault_handler" = x"no"; then
+	AC_DEFINE(HAVE_DISABLE_FAULT_HANDLER, 1, [Disable the default signal handler])
+fi
+
 ###################################################
 # Check for different/missing (set|get|end)netgrent prototypes
 CFLAGS_SAVE=$CFLAGS
diff --git a/source3/lib/pthreadpool/wscript_build b/source3/lib/pthreadpool/wscript_build
index 611ff5a..5488c3a 100644
--- a/source3/lib/pthreadpool/wscript_build
+++ b/source3/lib/pthreadpool/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA3_SUBSYSTEM('PTHREADPOOL',
                      source='pthreadpool.c',
-                     deps='pthread rt',
+                     deps='pthread rt replace',
                      enabled=bld.env.WITH_PTHREADPOOL)
 
 bld.SAMBA3_BINARY('pthreadpooltest',
diff --git a/wscript b/wscript
index e1fe953..e64e509 100755
--- a/wscript
+++ b/wscript
@@ -30,6 +30,7 @@ def set_options(opt):
     opt.RECURSE('lib/uid_wrapper')
     opt.RECURSE('pidl')
     opt.RECURSE('source3')
+    opt.RECURSE('lib/util')
 
     gr = opt.option_group('developer options')
     gr.add_option('--enable-build-farm',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list