Added tdb25
This commit is contained in:
@ -0,0 +1,50 @@
|
||||
--- buildtools/wafsamba/samba_autoconf.py.orig 2022-12-15 13:35:50 UTC
|
||||
+++ buildtools/wafsamba/samba_autoconf.py
|
||||
@@ -595,7 +595,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 []
|
||||
@@ -615,11 +615,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, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
|
||||
+ res = conf.check(features='c cshlib',
|
||||
+ fragment=fragment,
|
||||
+ lib=lib,
|
||||
+ uselib_store=lib,
|
||||
+ cflags=ccflags,
|
||||
+ ldflags=ldflags,
|
||||
+ uselib=lib.upper(),
|
||||
+ mandatory=False,
|
||||
+ msg=msg)
|
||||
else:
|
||||
- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
|
||||
+ res = conf.check(lib=lib,
|
||||
+ uselib_store=lib,
|
||||
+ cflags=ccflags,
|
||||
+ ldflags=ldflags,
|
||||
+ uselib=lib.upper(),
|
||||
+ mandatory=False,
|
||||
+ msg=msg)
|
||||
|
||||
if not res:
|
||||
if mandatory:
|
||||
@@ -989,5 +1007,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
|
||||
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
|
||||
|
||||
if (conf.env.undefined_ignore_ldflags == [] and
|
||||
- conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])):
|
||||
+ conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)):
|
||||
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
|
||||
Reference in New Issue
Block a user