diff options
| author | Timur I. Bakeyev <timur@FreeBSD.org> | 2018-02-20 23:17:49 +0000 |
|---|---|---|
| committer | Timur I. Bakeyev <timur@FreeBSD.org> | 2018-02-20 23:17:49 +0000 |
| commit | f8a1071d968bbfc7993ae758df93f6a326ef77d6 (patch) | |
| tree | 2fabf740e561c19f0117481a1e3f78a32d90d928 /databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py | |
| parent | Fix RANDOMIZE_MASTER_SITES. (diff) | |
Update supplimentary Samba libs to the latest versions.
Sponsored by: iXsystems Inc.
Diffstat (limited to 'databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py')
| -rw-r--r-- | databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py b/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py index 5245d0e4857b..c92d308462be 100644 --- a/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py +++ b/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py @@ -1,6 +1,47 @@ --- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC +++ buildtools/wafsamba/samba_autoconf.py -@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c +@@ -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 == []: |
