diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-03-16 13:34:05 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2012-03-16 05:14:02 +0100 |
| commit | af68fe7113ae0783f03732a6cda53e7ccae3220a (patch) | |
| tree | aec3c7c2e93d3f461c99f1bebdc58b7a5bc54f40 | |
| parent | 0affe19304b96332c5c1ff36373203216a35ec07 (diff) | |
| download | samba-af68fe7113ae0783f03732a6cda53e7ccae3220a.tar.gz samba-af68fe7113ae0783f03732a6cda53e7ccae3220a.tar.bz2 samba-af68fe7113ae0783f03732a6cda53e7ccae3220a.zip | |
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@samba.org>
Autobuild-Date: Fri Mar 16 05:14:03 CET 2012 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 4 | ||||
| -rwxr-xr-x | lib/ldb/wscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index de4632eea8..2bb86c786c 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 1a242ae986..f297e9af94 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) |