summaryrefslogtreecommitdiff
path: root/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py
diff options
context:
space:
mode:
Diffstat (limited to 'databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py')
-rw-r--r--databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py52
1 files changed, 0 insertions, 52 deletions
diff --git a/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py b/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py
deleted file mode 100644
index c92d308462be..000000000000
--- a/databases/ldb14/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ /dev/null
@@ -1,52 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
-
-
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
- '''check if a set of libraries exist as system libraries
-
- returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
- ret.append(lib)
- continue
-
-+ if msg is None:
-+ msg = 'Checking for library %s' % lib
-+
- (ccflags, ldflags, cpppath) = library_flags(conf, lib)
-+
- if shlib:
-- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+ res = conf.check(features='c cshlib',
-+ fragment=fragment,
-+ lib=lib,
-+ uselib_store=lib,
-+ ccflags=ccflags,
-+ ldflags=ldflags,
-+ uselib=lib.upper(),
-+ mandatory=False,
-+ msg=msg)
- else:
-- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+ res = conf.check(lib=lib,
-+ uselib_store=lib,
-+ ccflags=ccflags,
-+ ldflags=ldflags,
-+ uselib=lib.upper(),
-+ mandatory=False,
-+ msg=msg)
-
- if not res:
- if mandatory:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
- conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
-
- if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
-- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
- conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
-
- @conf