diff options
| author | Vadim Zhukov <persgray@gmail.com> | 2013-05-17 12:43:08 +0400 |
|---|---|---|
| committer | Bjoern Jacke <bj@sernet.de> | 2013-05-17 17:58:16 +0200 |
| commit | 2fda6c47f4aa46dbb42028732207a94821881c67 (patch) | |
| tree | 9159172a6140917251e0765cf835c71b03b14a05 | |
| parent | c3057f69a274f0d8e0e66183bd5e8be7703b6750 (diff) | |
| download | samba-2fda6c47f4aa46dbb42028732207a94821881c67.tar.gz samba-2fda6c47f4aa46dbb42028732207a94821881c67.tar.bz2 samba-2fda6c47f4aa46dbb42028732207a94821881c67.zip | |
More generic check for OpenBSD platform
OpenBSD versioning is different from many other
projects, and, say, 5.0 does not differ from 4.9 more than from 5.1. So the
right approach will be to check that platform name starts with "openbsd"
instead. This is also the thing OpenBSD developers do when patching other
software, so this patch is consistent with already existing practicies.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9888
Reviewed-by: Lars Müller <lars@samba.org>
Reviewed-by: Björn Jacke <bj@sernet.de>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Fri May 17 17:58:16 CEST 2013 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 4 | ||||
| -rwxr-xr-x | lib/ldb/wscript | 2 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 65c66f393b..fe110bd7e3 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -776,9 +776,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'] diff --git a/lib/ldb/wscript b/lib/ldb/wscript index fbed6fd594..fbfed1af8d 100755 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -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) @@ -140,7 +140,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 not 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"): |