From 3a88d49d12fe6c74dffe3e8d82235c71511cc07c Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sat, 16 Apr 2011 01:15:51 +0400 Subject: waf: introduce reverse logic for allowing unknown symbols Some os (ie OSX 10.6) forbids by default unknown symbols so in order to allow them (for special case) we have no to remove linker option *but* to add options to ask the linker to be more relax. Signed-off-by: Andrew Bartlett --- buildtools/wafsamba/samba_deps.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index adeb3645ce1..0bd2c6cf67b 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -89,6 +89,10 @@ def build_dependencies(self): for f in self.env.undefined_ldflags: self.ldflags.remove(f) + if getattr(self, 'allow_undefined_symbols', False) and self.env.undefined_ignore_ldflags: + for f in self.env.undefined_ignore_ldflags: + self.ldflags.append(f) + debug('deps: computed dependencies for target %s: uselib=%s uselib_local=%s add_objects=%s', self.sname, self.uselib, self.uselib_local, self.add_objects) -- cgit From 7e4ba48135608b5c93cfa4e15f5e4e2c0788d61e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 7 May 2011 00:49:13 +1000 Subject: build: allow s3 libraries to be built with no undefined symbols Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/samba3.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index cb459ad115a..e44e28bba90 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -89,13 +89,15 @@ def s3_fix_kwargs(bld, kwargs): def SAMBA3_LIBRARY(bld, name, *args, **kwargs): s3_fix_kwargs(bld, kwargs) - kwargs['allow_undefined_symbols'] = True + if not 'allow_undefined_symbols' in kwargs: + kwargs['allow_undefined_symbols'] = True return bld.SAMBA_LIBRARY(name, *args, **kwargs) Build.BuildContext.SAMBA3_LIBRARY = SAMBA3_LIBRARY def SAMBA3_MODULE(bld, name, *args, **kwargs): s3_fix_kwargs(bld, kwargs) - kwargs['allow_undefined_symbols'] = True + if not 'allow_undefined_symbols' in kwargs: + kwargs['allow_undefined_symbols'] = True return bld.SAMBA_MODULE(name, *args, **kwargs) Build.BuildContext.SAMBA3_MODULE = SAMBA3_MODULE -- cgit From 3ccfe7cb7be80cc6fa5b8fc437af72168515b892 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 10 May 2011 11:37:30 +0930 Subject: Add -fno-common where supported (WAF only) Normally under UNIX, uninitialized non-static global variables get placed in the "common" section, where they are merged at link time. This means if two C files define "int debug", they will end up referring to the same variable. Or if one does "float level" and the other does "int level" you'll get an accidental union. Such bugs can be hard to track down; fortunately GCC offers -fno-common to disable this feature. It didn't reveal any places which need fixing, however). Signed-off-by: Rusty Russell --- buildtools/wafsamba/samba_autoconf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 174ca142102..207d7320b95 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -597,7 +597,7 @@ def SAMBA_CONFIG_H(conf, path=None): if Options.options.developer: # we add these here to ensure that -Wstrict-prototypes is not set during configure - conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes', + conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes -fno-common', testflags=True) if os.getenv('TOPLEVEL_BUILD'): conf.ADD_CFLAGS('-Wcast-qual', testflags=True) -- cgit From f725e2b64eec48c0fe21a125065152c684d361ee Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 1 Jun 2011 11:43:52 +1000 Subject: build: fixed a problem with installing scripts in the build tree the SAMBA_SCRIPT() function was not always triggering correctly. The base problem was that we were using a target outside the build tree. This implements a simpler solution where we just create the links directly in SAMBA_SCRIPT() rather than creating a waf task Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Jun 1 06:50:04 CEST 2011 on sn-devel-104 --- buildtools/wafsamba/wafsamba.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 2a1c82a3077..43b7f616dc7 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -628,17 +628,6 @@ def ENABLE_TIMESTAMP_DEPENDENCIES(conf): Utils.h_file = h_file - -t = Task.simple_task_type('copy_script', 'rm -f "${LINK_TARGET}" && ln -s "${SRC[0].abspath(env)}" ${LINK_TARGET}', - shell=True, color='PINK', ext_in='.bin') -t.quiet = True - -@feature('copy_script') -@before('apply_link') -def copy_script(self): - tsk = self.create_task('copy_script', self.allnodes[0]) - tsk.env.TARGET = self.target - def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None): '''used to copy scripts from the source tree into the build directory for use by selftest''' @@ -653,15 +642,17 @@ def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None): target = os.path.join(installdir, iname) tgtdir = os.path.dirname(os.path.join(bld.srcnode.abspath(bld.env), '..', target)) mkdir_p(tgtdir) - t = bld(features='copy_script', - source = s, - target = target, - always = True, - install_path = None) - t.env.LINK_TARGET = target - + link_src = os.path.normpath(os.path.join(bld.curdir, s)) + link_dst = os.path.join(tgtdir, os.path.basename(iname)) + if os.path.islink(link_dst) and os.readlink(link_dst) == link_src: + continue + if os.path.exists(link_dst): + os.unlink(link_dst) + Logs.info("symlink: %s -> %s/%s" % (s, installdir, iname)) + os.symlink(link_src, link_dst) Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT + def copy_and_fix_python_path(task): pattern='sys.path.insert(0, "bin/python")' if task.env["PYTHONARCHDIR"] in sys.path and task.env["PYTHONDIR"] in sys.path: -- cgit From ae1414e79698c0c506aabd7458c4fbae8cc8fcf5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 10 Jun 2011 11:32:27 +1000 Subject: waf: fixed 'make bin/XXX' for the remaining binaries this fixes 'make bin/smbd' to work correctly with the waf build. It didn't work before as smbd is actually 'smbd/smbd' internally and we tried to use the target name 'smbd'. The new approach reads the symlink to get the right target. This also speeds up the null build by quite a lot --- buildtools/scripts/Makefile.waf | 2 +- buildtools/wafsamba/samba_wildcard.py | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) (limited to 'buildtools') diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index 716ab932706..5fc939c99e0 100644 --- a/buildtools/scripts/Makefile.waf +++ b/buildtools/scripts/Makefile.waf @@ -62,7 +62,7 @@ ctags: $(WAF) ctags bin/%:: FORCE - $(WAF) --targets=`basename $@` + $(WAF) --targets=$@ FORCE: configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf diff --git a/buildtools/wafsamba/samba_wildcard.py b/buildtools/wafsamba/samba_wildcard.py index 5bf12672a95..75ab5defcdc 100644 --- a/buildtools/wafsamba/samba_wildcard.py +++ b/buildtools/wafsamba/samba_wildcard.py @@ -17,7 +17,7 @@ def run_task(t, k): def run_named_build_task(cmd): '''run a named build task, matching the cmd name using fnmatch wildcards against inputs and outputs of all build tasks''' - bld = fake_build_environment() + bld = fake_build_environment(info=False) found = False cwd_node = bld.root.find_dir(os.getcwd()) top_node = bld.root.find_dir(bld.srcnode.abspath()) @@ -50,6 +50,28 @@ def run_named_build_task(cmd): raise Utils.WafError("Unable to find build target matching %s" % cmd) +def rewrite_compile_targets(): + '''cope with the bin/ form of compile target''' + if not Options.options.compile_targets: + return + + bld = fake_build_environment(info=False) + targets = LOCAL_CACHE(bld, 'TARGET_TYPE') + tlist = [] + + for t in Options.options.compile_targets.split(','): + if not os.path.islink(t): + tlist.append(t) + continue + link = os.readlink(t) + list = link.split('/') + for name in [list[-1], '/'.join(list[-2:])]: + if name in targets: + tlist.append(name) + continue + Options.options.compile_targets = ",".join(tlist) + + def wildcard_main(missing_cmd_fn): '''this replaces main from Scripting, allowing us to override the @@ -60,6 +82,9 @@ def wildcard_main(missing_cmd_fn): ''' Scripting.commands = Options.arg_line[:] + # rewrite the compile targets to cope with the bin/xx form + rewrite_compile_targets() + while Scripting.commands: x = Scripting.commands.pop(0) @@ -99,7 +124,7 @@ def wildcard_main(missing_cmd_fn): -def fake_build_environment(): +def fake_build_environment(info=True, flush=False): """create all the tasks for the project, but do not run the build return the build context in use""" bld = getattr(Utils.g_module, 'build_context', Utils.Context)() @@ -119,10 +144,12 @@ def fake_build_environment(): bld.load_dirs(proj[SRCDIR], proj[BLDDIR]) bld.load_envs() - Logs.info("Waf: Entering directory `%s'" % bld.bldnode.abspath()) + if info: + Logs.info("Waf: Entering directory `%s'" % bld.bldnode.abspath()) bld.add_subdirs([os.path.split(Utils.g_module.root_path)[0]]) bld.pre_build() - bld.flush() + if flush: + bld.flush() return bld -- cgit From 683f9868eb13cfaaf0da81bf002a85b81c928f51 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 10 Jun 2011 12:16:59 +1000 Subject: waf-symbols: don't look for symbol lists in GENERATOR targets generated header files are not object files Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/symbols.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py index ed195176e65..dfab71c2c43 100644 --- a/buildtools/wafsamba/symbols.py +++ b/buildtools/wafsamba/symbols.py @@ -447,7 +447,7 @@ def check_dependencies(bld, t): deps = set(t.samba_deps) for d in t.samba_deps: - if targets[d] in [ 'EMPTY', 'DISABLED', 'SYSLIB' ]: + if targets[d] in [ 'EMPTY', 'DISABLED', 'SYSLIB', 'GENERATOR' ]: continue bld.ASSERT(d in bld.env.public_symbols, "Failed to find symbol list for dependency '%s'" % d) diff = remaining.intersection(bld.env.public_symbols[d]) -- cgit From 720da3cb9131d4e3bdd0352538f0c5d52c4655c8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 15 Jun 2011 13:53:19 +1000 Subject: build: fixed dependencies on install prefix for pc files and python scripts waf can't automatically determine these dependencies as the construction of the files is via a python function thanks to Andrew for noticing this bug --- buildtools/wafsamba/pkgconfig.py | 1 + buildtools/wafsamba/wafsamba.py | 2 ++ 2 files changed, 3 insertions(+) (limited to 'buildtools') diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py index 09bfcb9c6be..8a3f807dc55 100644 --- a/buildtools/wafsamba/pkgconfig.py +++ b/buildtools/wafsamba/pkgconfig.py @@ -53,6 +53,7 @@ def PKG_CONFIG_FILES(bld, pc_files, vnum=None): rule=subst_at_vars, source=f+'.in', target=f) + bld.add_manual_dependency(bld.path.find_or_declare(f), bld.env['PREFIX']) t.vars = [] if t.env.RPATH_ON_INSTALL: t.env.LIB_RPATH = t.env.RPATH_ST % t.env.LIBDIR diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 43b7f616dc7..d76afc49847 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -692,6 +692,8 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False, rule=copy_and_fix_python_path, source=file, target=inst_file) + bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONARCHDIR"]) + bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONDIR"]) file = inst_file if base_name: file = os.path.join(base_name, file) -- cgit From 8c14decdb8cbc5622d7cf9804bef857d0538ede0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 15 Jun 2011 14:13:04 +1000 Subject: build: fixed development symlinks for libraries in subdirectories this fixes the symlink for libsmbclient.so Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Jun 15 07:23:10 CEST 2011 on sn-devel-104 --- buildtools/wafsamba/samba_install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index d755d010784..26d0a371e6d 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -137,9 +137,9 @@ def install_library(self): os.path.join(self.path.abspath(bld.env), inst_name)) if install_link and install_link != install_name: # and the symlink if needed - bld.symlink_as(os.path.join(install_path, install_link), install_name) + bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name)) if dev_link: - bld.symlink_as(os.path.join(install_path, dev_link), install_name) + bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name)) @feature('cshlib') -- cgit From d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 17 Jun 2011 15:21:39 +1000 Subject: build: only use the git version on install, not in the build tree having the git version in our version.h in the build tree is annoying for developers, as every time you commit or rebase you need to spend several minutes re-linking. This changes it to use the git version only on install, which is much more useful as when you actually install the binaries you may be using them in a way that reporting the version is useful Pair-Programmed-With: Andrew Bartlett Autobuild-User: Andrew Tridgell Autobuild-Date: Fri Jun 17 08:37:06 CEST 2011 on sn-devel-104 --- buildtools/wafsamba/samba_patterns.py | 3 ++- buildtools/wafsamba/samba_version.py | 15 +++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py index 37ef4198a68..f064608f3a3 100644 --- a/buildtools/wafsamba/samba_patterns.py +++ b/buildtools/wafsamba/samba_patterns.py @@ -10,7 +10,7 @@ def write_version_header(task): src = task.inputs[0].srcpath(task.env) tgt = task.outputs[0].bldpath(task.env) - version = samba_version_file(src, task.env.srcdir, env=task.env) + version = samba_version_file(src, task.env.srcdir, env=task.env, is_install=task.env.is_install) string = str(version) f = open(tgt, 'w') @@ -26,4 +26,5 @@ def SAMBA_MKVERSION(bld, target): source= 'VERSION', target=target, always=True) + t.env.is_install = bld.is_install Build.BuildContext.SAMBA_MKVERSION = SAMBA_MKVERSION diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index 0b0c159f55f..0c39ed44ecd 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -90,7 +90,7 @@ def git_version_summary(path, env=None): class SambaVersion(object): - def __init__(self, version_dict, path, env=None): + def __init__(self, version_dict, path, env=None, is_install=True): '''Determine the version number of samba See VERSION for the format. Entries on that file are @@ -152,7 +152,10 @@ also accepted as dictionary entries here SAMBA_VERSION_STRING += ("rc%u" % self.RC_RELEASE) if self.IS_SNAPSHOT: - if os.path.exists(os.path.join(path, ".git")): + if not is_install: + suffix = "DEVELOPERBUILD" + self.vcs_fields = {} + elif os.path.exists(os.path.join(path, ".git")): suffix, self.vcs_fields = git_version_summary(path, env=env) elif os.path.exists(os.path.join(path, ".bzr")): suffix, self.vcs_fields = bzr_version_summary(path) @@ -234,7 +237,7 @@ also accepted as dictionary entries here return string -def samba_version_file(version_file, path, env=None): +def samba_version_file(version_file, path, env=None, is_install=True): '''Parse the version information from a VERSION file''' f = open(version_file, 'r') @@ -254,16 +257,16 @@ def samba_version_file(version_file, path, env=None): print("Failed to parse line %s from %s" % (line, version_file)) raise - return SambaVersion(version_dict, path, env=env) + return SambaVersion(version_dict, path, env=env, is_install=is_install) -def load_version(env=None): +def load_version(env=None, is_install=True): '''load samba versions either from ./VERSION or git return a version object for detailed breakdown''' if not env: env = samba_utils.LOAD_ENVIRONMENT() - version = samba_version_file("./VERSION", ".", env) + version = samba_version_file("./VERSION", ".", env, is_install=is_install) Utils.g_module.VERSION = version.STRING return version -- cgit From 0e4c358e2710580d5aeb439d767c87aaf4c0f2f3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 18:40:25 +0930 Subject: tdb_compat.h: divert every tdb build and includes to tdb_compat We change all the headers and wscript files to use tdb_compat; this means we have one place to decide whether to use TDB1 or TDB2. Signed-off-by: Rusty Russell --- buildtools/wafsamba/samba3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index e44e28bba90..d73fa3a8294 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -51,7 +51,7 @@ def s3_fix_kwargs(bld, kwargs): s3reldir = os_path_relpath(s3dir, bld.curdir) # the extra_includes list is relative to the source3 directory - extra_includes = [ '.', 'include', 'lib' ] + extra_includes = [ '.', 'include', 'lib', '../lib/tdb_compat' ] if bld.env.use_intree_heimdal: extra_includes += [ '../source4/heimdal/lib/com_err', '../source4/heimdal/lib/gssapi', -- cgit From 985e83ef520da68a60899f0ad977cb28a77b8cbe Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 18:40:34 +0930 Subject: tdb2: tie it into build process if --enable-tdb2-breaks-compat This is simplistic. We need to support making TDB2 a standalone library, but for now, we simply built it in-tree. Once we have tdb1 compatibility in tdb2, we can rename this option to --enable-tdb2. Signed-off-by: Rusty Russell --- buildtools/wafsamba/samba3.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index d73fa3a8294..c11e7d8f2a2 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -57,8 +57,12 @@ def s3_fix_kwargs(bld, kwargs): '../source4/heimdal/lib/gssapi', '../source4/heimdal_build' ] - if not bld.CONFIG_SET('USING_SYSTEM_TDB'): - extra_includes += [ '../lib/tdb/include' ] + if bld.CONFIG_SET('BUILD_TDB2'): + if not bld.CONFIG_SET('USING_SYSTEM_TDB2'): + extra_includes += [ '../lib/tdb2' ] + else: + if not bld.CONFIG_SET('USING_SYSTEM_TDB'): + extra_includes += [ '../lib/tdb/include' ] if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'): extra_includes += [ '../lib/tevent' ] -- cgit From 52255f4eb50866cb2eceb92308c9a5ab49c04f7c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2011 16:05:23 +1000 Subject: s3-build: Require fully defined symbols for all public libraries --- buildtools/wafsamba/samba3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index c11e7d8f2a2..084427f3a71 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -93,7 +93,7 @@ def s3_fix_kwargs(bld, kwargs): def SAMBA3_LIBRARY(bld, name, *args, **kwargs): s3_fix_kwargs(bld, kwargs) - if not 'allow_undefined_symbols' in kwargs: + if not 'allow_undefined_symbols' in kwargs and ('private_library' in kwargs and kwargs['private_library'] == True): kwargs['allow_undefined_symbols'] = True return bld.SAMBA_LIBRARY(name, *args, **kwargs) Build.BuildContext.SAMBA3_LIBRARY = SAMBA3_LIBRARY -- cgit From 877de9fee773b3f6b5a95afe1d01001e0b1b4ff2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 24 Jun 2011 11:47:45 +1000 Subject: s3-build Require fully defined symbols in ALL libraries by default The only exception here is libsmbregistry, which needs further work to resolve the library loop caused by the registry based smb.conf loading. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Fri Jun 24 05:01:38 CEST 2011 on sn-devel-104 --- buildtools/wafsamba/samba3.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 084427f3a71..d77cd4d41e9 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -93,8 +93,6 @@ def s3_fix_kwargs(bld, kwargs): def SAMBA3_LIBRARY(bld, name, *args, **kwargs): s3_fix_kwargs(bld, kwargs) - if not 'allow_undefined_symbols' in kwargs and ('private_library' in kwargs and kwargs['private_library'] == True): - kwargs['allow_undefined_symbols'] = True return bld.SAMBA_LIBRARY(name, *args, **kwargs) Build.BuildContext.SAMBA3_LIBRARY = SAMBA3_LIBRARY -- cgit