Attachment 8895 Details for Bug 9888 – Patch to fix issue

[patch] Patch to fix issue

openbsd-generic-check_2.patch (text/plain), 2.30 KB, created by Vadim Zhukov on 2013-05-16 14:42:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vadim Zhukov

Created: 2013-05-16 14:42:49 UTC

Size: 2.30 KB

patch

obsolete

>Use more generic check for OpenBSD.
>--- buildtools/wafsamba/samba_autoconf.py.orig	Sat May 11 12:20:52 2013
>+++ buildtools/wafsamba/samba_autoconf.py	Sat May 11 13:04:26 2013
>@@ -776,9 +797,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" and sys.platform != "openbsd5":
>+    if not sys.platform.startswith("openbsd"):
>         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
> 
>-    if sys.platform != "openbsd4" and sys.platform != "openbsd5" and conf.env.undefined_ignore_ldflags == []:
>+    if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
>         if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
>             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
>--- lib/ldb/wscript.orig	Wed May 15 22:54:13 2013
>+++ lib/ldb/wscript	Thu May 16 14:54:31 2013
>@@ -64,7 +64,7 @@ def configure(conf):
> 
>         # we don't want any libraries or modules to rely on runtime
>         # resolution of symbols
>-        if sys.platform != "openbsd4" and sys.platform != "openbsd5":
>+        if not sys.platform.startswith("openbsd"):
>             conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
> 
>     conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
>--- source3/wscript.orig	Sat May 11 13:11:06 2013
>+++ source3/wscript	Sat May 11 13:11:12 2013
>@@ -68,7 +68,7 @@ def configure(conf):
>     if Options.options.with_swat:
>         conf.env['build_swat'] = True
> 
>-    if sys.platform != 'openbsd5':
>+    if not sys.platform.startswith('openbsd'):
>         conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
> 
>     conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=9888
>--- wscript.orig	Sat May 11 13:14:18 2013
>+++ wscript	Sat May 11 13:14:23 2013
>@@ -151,7 +151,7 @@ def configure(conf):
>     # allows us to find problems on our development hosts faster.
>     # It also results in faster load time.
> 
>-    if sys.platform != "openbsd4":
>+    if sys.platform.startswith("openbsd"):
>         conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
> 
>     if not conf.CHECK_NEED_LC("-lc not needed"):

Actions: View

Attachments on bug 9888: 8890 | 8895 | 8896 | 8899 | 8907