From 2fda6c47f4aa46dbb42028732207a94821881c67 Mon Sep 17 00:00:00 2001 From: Vadim Zhukov Date: Fri, 17 May 2013 12:43:08 +0400 Subject: More generic check for OpenBSD platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Björn Jacke Autobuild-User(master): Björn Jacke Autobuild-Date(master): Fri May 17 17:58:16 CEST 2013 on sn-devel-104 --- buildtools/wafsamba/samba_autoconf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildtools') 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'] -- cgit