[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  caa8a92 build: change compile flags on mac os x if we face pb with common symbols
       via  e5eaed0 remove useless debug message :-)
      from  498743b show_test_time: Move to root scripting directory as it's useful for s3 and s4.

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


- Log -----------------------------------------------------------------
commit caa8a92f528387e047ecc5a03addbd67777b1c05
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Nov 27 17:11:35 2010 +0300

    build: change compile flags on mac os x if we face pb with common symbols
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sat Nov 27 18:02:41 CET 2010 on sn-devel-104

commit e5eaed0180467bbe27b1fd6073298c18c3b1af8d
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Nov 27 13:44:50 2010 +0300

    remove useless debug message :-)

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

Summary of changes:
 selftest/target/Samba4.pm |    1 -
 source4/wscript           |    6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 12414f0..37c9550 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -841,7 +841,6 @@ sub provision($$$$$$$$$)
 
 	my $ret = $self->provision_raw_step1($ctx);
 	unless (defined $ret) {
-		print "coin coin\n";
 		return undef;
 	}
 
diff --git a/source4/wscript b/source4/wscript
index 80916f5..48f340c 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -87,8 +87,10 @@ def configure(conf):
     conf.check_python_headers(mandatory=True)
 
     if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
-        if not conf.CHECK_SHLIB_W_PYTHON("Checking if -single_module is not needed"):
-            conf.env.append_value('shlib_LINKFLAGS', ['-single_module'])
+        # Mac OSX needs to have this and it's also needed that the python is compiled with this
+        # otherwise you face errors about common symbols
+        if not conf.CHECK_SHLIB_W_PYTHON("Checking if -fno-common is needed"):
+            conf.ADD_CFLAGS('-fno-common')
         if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
             conf.env.append_value('shlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
     if int(conf.env['PYTHON_VERSION'][0]) >= 3:


-- 
Samba Shared Repository