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/wafsamba/samba3.py') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index cb459ad115..e44e28bba9 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 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/wafsamba/samba3.py') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index e44e28bba9..d73fa3a829 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/wafsamba/samba3.py') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index d73fa3a829..c11e7d8f2a 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/wafsamba/samba3.py') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index c11e7d8f2a..084427f3a7 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/wafsamba/samba3.py') diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 084427f3a7..d77cd4d41e 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