From 0ffc4c51ee8cc9147c76d2ab1ba1f2f72c8107ca Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 21 Apr 2011 20:02:28 +1000 Subject: build: Invert --enable-s3build into --disable-s3build We always want the s3 binaries, except when building an smbtorture4 for the s3-waf and autoconf builds. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Tue Apr 26 04:27:28 CEST 2011 on sn-devel-104 --- wscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 6961eb84af7..46773bfd86a 100755 --- a/wscript +++ b/wscript @@ -47,8 +47,8 @@ def set_options(opt): help='enable special build farm options', action='store_true', dest='BUILD_FARM') - gr.add_option('--enable-s3build', - help='enable build of s3 binaries', + gr.add_option('--disable-s3build', + help='disable build of s3 binaries', action='store_true', dest='S3BUILD') opt.tool_options('python') # options for disabling pyc or pyo compilation @@ -66,8 +66,9 @@ def configure(conf): if Options.options.developer: conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') + conf.env.enable_s3build = True if Options.options.S3BUILD: - conf.env.enable_s3build = True + conf.env.enable_s3build = False # this enables smbtorture.static for s3 in the build farm conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM') -- cgit 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 --- wscript | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'wscript') diff --git a/wscript b/wscript index 46773bfd86a..7e9d7730ab7 100755 --- a/wscript +++ b/wscript @@ -122,6 +122,11 @@ def configure(conf): if sys.platform != "openbsd4": conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) + if sys.platform != "openbsd4" and conf.env.undefined_ignore_ldflags == []: + if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']): + conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] + + # gentoo always adds this. We want our normal build to be as # strict as the strictest OS we support, so adding this here # allows us to find problems on our development hosts faster. -- cgit From d526f861c71c1a0c595bc9b9351a02cc630e41c4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 27 Apr 2011 20:07:45 +1000 Subject: build: Add lib/replace as a default include path This makes #include "system/filesys.h" in the source3/includes/includes.h work more often. Andrew Bartlett --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 7e9d7730ab7..950442792c0 100755 --- a/wscript +++ b/wscript @@ -73,7 +73,7 @@ def configure(conf): # this enables smbtorture.static for s3 in the build farm conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM') - conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include') + conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace') conf.RECURSE('lib/replace') -- cgit From d1df1cb714289b90dc173a72e488773960952402 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 8 May 2011 17:35:05 +0200 Subject: build: Allow the C code to know if this is a waf build This allows addition of functionality that can't be handled (for example, due to dependencies) in the autoconf build. Andrew Bartlett --- wscript | 1 + 1 file changed, 1 insertion(+) (limited to 'wscript') diff --git a/wscript b/wscript index 950442792c0..04c4e9140b2 100755 --- a/wscript +++ b/wscript @@ -60,6 +60,7 @@ def configure(conf): version = samba_version.load_version(env=conf.env) conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) + conf.DEFINE('_SAMBA_WAF_BUILD_', version.MAJOR) conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True) conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) -- cgit From 14f99167f600ae9a3351d4ff7d089e54ca3149ac Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 May 2011 11:00:18 +0200 Subject: build: Remove --disable-s3build so we can rely on these subsystems This will make it easier to write code that uses the whole codebase. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Mon May 9 12:25:33 CEST 2011 on sn-devel-104 --- wscript | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 04c4e9140b2..92c2594f3eb 100755 --- a/wscript +++ b/wscript @@ -47,10 +47,6 @@ def set_options(opt): help='enable special build farm options', action='store_true', dest='BUILD_FARM') - gr.add_option('--disable-s3build', - help='disable build of s3 binaries', - action='store_true', dest='S3BUILD') - opt.tool_options('python') # options for disabling pyc or pyo compilation # enable options related to building python extensions @@ -67,10 +63,6 @@ def configure(conf): if Options.options.developer: conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') - conf.env.enable_s3build = True - if Options.options.S3BUILD: - conf.env.enable_s3build = False - # this enables smbtorture.static for s3 in the build farm conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM') @@ -115,8 +107,7 @@ def configure(conf): conf.RECURSE('libcli/smbreadline') conf.RECURSE('pidl') conf.RECURSE('selftest') - if conf.env.enable_s3build: - conf.RECURSE('source3') + conf.RECURSE('source3') # we don't want any libraries or modules to rely on runtime # resolution of symbols -- 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 --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 92c2594f3eb..8e1e9a6305b 100755 --- a/wscript +++ b/wscript @@ -157,7 +157,7 @@ def ctags(ctx): # of commands in --help def build(bld): '''build all targets''' - samba_version.load_version(env=bld.env) + samba_version.load_version(env=bld.env, is_install=bld.is_install) pass -- cgit From 754c677b0bbf3ea6c7d2a73c93848f1b0d68c91e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 16:54:15 +0930 Subject: lib: import ccan modules for tdb2 Imported from git://git.ozlabs.org/~ccan/ccan init-1161-g661d41f Signed-off-by: Rusty Russell --- wscript | 1 + 1 file changed, 1 insertion(+) (limited to 'wscript') diff --git a/wscript b/wscript index 8e1e9a6305b..52d0ea4f446 100755 --- a/wscript +++ b/wscript @@ -95,6 +95,7 @@ def configure(conf): conf.RECURSE('source4/lib/tls') conf.RECURSE('source4/ntvfs/sysdep') conf.RECURSE('lib/util') + conf.RECURSE('lib/ccan') conf.RECURSE('lib/zlib') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') -- cgit From 577034b3cd18c518140b91ade6b94487734ed92a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 20 Jun 2011 21:22:59 +1000 Subject: build: disable -Wl,--as-needed to try and fix the build The issue here is that the source3 components now built as part of the top level build do not have their depenencies fully specified, and this causes the build to fail for many of our users. When we fix that, we can restore this flag, so we again find that kind of bug, which will show up for our Gentoo users regardless. Andrew Bartlett --- wscript | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 52d0ea4f446..1fa0d8f5439 100755 --- a/wscript +++ b/wscript @@ -124,8 +124,13 @@ def configure(conf): # strict as the strictest OS we support, so adding this here # allows us to find problems on our development hosts faster. # It also results in faster load time. - if sys.platform != "openbsd4": - conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True) + + # However, until the source3 waf build settles down, this needs to + # be disabled, as the bugs mentioned above are hitting too many of + # our users + + #if sys.platform != "openbsd4": + # conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True) if not conf.CHECK_NEED_LC("-lc not needed"): conf.ADD_LDFLAGS('-lc', testflags=False) -- cgit From 35a9c23a016e76df7b5647e1b9285f70d15db807 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 21 Jun 2011 12:48:22 +1000 Subject: build: move dynconfig for top level build up Signed-off-by: Andrew Tridgell --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 1fa0d8f5439..4399d0e67a3 100755 --- a/wscript +++ b/wscript @@ -32,7 +32,7 @@ def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.PRIVATE_EXTENSION_DEFAULT('samba4') opt.RECURSE('lib/replace') - opt.RECURSE('source4/dynconfig') + opt.RECURSE('dynconfig') opt.RECURSE('source4/lib/ldb') opt.RECURSE('selftest') opt.RECURSE('source4/lib/tls') @@ -89,7 +89,7 @@ def configure(conf): if int(conf.env['PYTHON_VERSION'][0]) >= 3: raise Utils.WafError('Python version 3.x is not supported by Samba yet') - conf.RECURSE('source4/dynconfig') + conf.RECURSE('dynconfig') conf.RECURSE('source4/lib/ldb') conf.RECURSE('source4/heimdal_build') conf.RECURSE('source4/lib/tls') -- cgit From 47d098856d8634d35e2d96932d9e6c8421655543 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 24 Jun 2011 14:14:51 +1000 Subject: build: Remove blacklist now we have a common build --- wscript | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 4399d0e67a3..a4fb4700872 100755 --- a/wscript +++ b/wscript @@ -13,16 +13,6 @@ import wafsamba, Options, samba_dist, Scripting, Utils, samba_version samba_dist.DIST_DIRS('.') -#This is a list of files that we don't want in the package, for -#whatever reason. Directories should be listed with a trailing / to -#avoid over-exclusion. - -#This list includes files that would confuse the recipient of a -#samba-4.0.0 branded tarball (until the merge is complete) and the -#core elements of the autotools build system (which is known to -#produce buggy binaries). -samba_dist.DIST_BLACKLIST('README Manifest Read-Manifest-Now Roadmap ' + - 'packaging/ docs-xml/ examples/ swat/ WHATSNEW.txt MAINTAINERS ') # install in /usr/local/samba by default Options.default_prefix = '/usr/local/samba' -- cgit