[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  af68fe7 build: Fix build issue on OpenBSD 5.x
      from  0affe19 Remove more unnecessary shebang lines in python files.

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


- Log -----------------------------------------------------------------
commit af68fe7113ae0783f03732a6cda53e7ccae3220a
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Mar 16 13:34:05 2012 +1100

    build: Fix build issue on OpenBSD 5.x
    
    Do not use -Wl,-no-undefined flag on OpenBSD 5.x (tested on 5.0)
    
    Autobuild-User: Amitay Isaacs <amitay at samba.org>
    Autobuild-Date: Fri Mar 16 05:14:03 CET 2012 on sn-devel-104

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

Summary of changes:
 buildtools/wafsamba/samba_autoconf.py |    4 ++--
 lib/ldb/wscript                       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index de4632e..2bb86c7 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -722,9 +722,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
 def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
     # we don't want any libraries or modules to rely on runtime
     # resolution of symbols
-    if sys.platform != "openbsd4":
+    if sys.platform != "openbsd4" and sys.platform != "openbsd5":
         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
 
-    if sys.platform != "openbsd4" and conf.env.undefined_ignore_ldflags == []:
+    if sys.platform != "openbsd4" and sys.platform != "openbsd5" and conf.env.undefined_ignore_ldflags == []:
         if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 1a242ae..f297e9a 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -68,7 +68,7 @@ def configure(conf):
 
         # we don't want any libraries or modules to rely on runtime
         # resolution of symbols
-        if sys.platform != "openbsd4":
+        if sys.platform != "openbsd4" and sys.platform != "openbsd5":
             conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
 
     conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)


-- 
Samba Shared Repository