The branch, master has been updated via 5143353... samba4: Build libreplace as builtin library by default so it doesn't end up in $prefix/lib. via f2527d2... replace: Avoid hiding symbols when libreplace is builtin, as this appears to cause unresolved symbols at the moment. via 380ee5f... ldb: Remove dependency on self. via e0fe941... wafsamba: Use BUILTIN_LIBRARY() rather than relying on side-effects. via da0fb0a... ldbsamba: Build as subsystem to prevent infinite recursion issues. via 4c22434... s4: Don't build a $prefix/lib/libpython.so, as such a library often already exists :-) via b391b7d... s4-waf: Don't include pytalloc when embedding python. via ebd0bca... s4: Build more python convenience files as subsystems rather than as python modules. via 8e84962... ldb: Don't build pyldb_util as python module but rather as subsystem, so as to not delute /usr/lib. via f74dced... ldb-samba: Don't build pyldbsamba as python module but rather as subsystem, so as to not delute /usr/lib. via 9382507... web_server: Don't build wsgi support as python module but rather as subsystem so we don't install it into /usr/lib. from 837a975... s4:cldap_server/rootdse.c - simplify the code a bit
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 5143353108c02a27ad62b33e59a26f5bc5d136fe Author: Jelmer Vernooij <jel...@samba.org> Date: Fri Jun 18 22:43:37 2010 +0200 samba4: Build libreplace as builtin library by default so it doesn't end up in $prefix/lib. commit f2527d217cbc7f64259d00c63a549a3119a4ed66 Author: Jelmer Vernooij <jel...@samba.org> Date: Fri Jun 18 22:43:17 2010 +0200 replace: Avoid hiding symbols when libreplace is builtin, as this appears to cause unresolved symbols at the moment. commit 380ee5f081d4525c5c308ec203864b07c3cf36a1 Author: Jelmer Vernooij <jel...@samba.org> Date: Fri Jun 18 10:09:03 2010 +0200 ldb: Remove dependency on self. commit e0fe9412186ab0962c672241ac386cafb25f95ef Author: Jelmer Vernooij <jel...@samba.org> Date: Fri Jun 18 09:45:15 2010 +0200 wafsamba: Use BUILTIN_LIBRARY() rather than relying on side-effects. commit da0fb0affbf4601aca6aa83264b2c81cc9d1d4c1 Author: Jelmer Vernooij <jel...@samba.org> Date: Thu Jun 17 22:36:33 2010 +0200 ldbsamba: Build as subsystem to prevent infinite recursion issues. commit 4c22434b3b261d5af45131dc5542e81857c4f468 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jun 16 20:38:22 2010 +0200 s4: Don't build a $prefix/lib/libpython.so, as such a library often already exists :-) commit b391b7d07274d30231273255ebe064b4c356e855 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jun 16 20:35:40 2010 +0200 s4-waf: Don't include pytalloc when embedding python. commit ebd0bca555f13f19bebdb220088c97a3473daa61 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jun 16 20:15:19 2010 +0200 s4: Build more python convenience files as subsystems rather than as python modules. commit 8e8496208b4fa5bf69fcc884fdb054352060e21e Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jun 16 20:14:46 2010 +0200 ldb: Don't build pyldb_util as python module but rather as subsystem, so as to not delute /usr/lib. commit f74dceda8c91b46180e14787ffd3dce01e1b023d Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jun 16 20:14:31 2010 +0200 ldb-samba: Don't build pyldbsamba as python module but rather as subsystem, so as to not delute /usr/lib. commit 938250790967dffa617446ab2e7b266b06033495 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jun 16 20:01:38 2010 +0200 web_server: Don't build wsgi support as python module but rather as subsystem so we don't install it into /usr/lib. ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/wafsamba.py | 4 ++-- lib/replace/wscript | 6 +++++- source4/lib/ldb-samba/wscript_build | 4 ++-- source4/lib/ldb/wscript | 6 +++--- source4/param/wscript_build | 10 ++++++---- source4/scripting/python/wscript_build | 9 +++++---- source4/web_server/wscript_build | 5 +++-- source4/wscript | 2 +- 8 files changed, 27 insertions(+), 19 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index eb2d56e..e455445 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -132,7 +132,7 @@ def SAMBA_LIBRARY(bld, libname, source, SET_TARGET_TYPE(bld, libname, 'EMPTY') return - if target_type != 'PYTHON' and BUILTIN_LIBRARY(bld, libname): + if BUILTIN_LIBRARY(bld, libname): obj_target = libname else: obj_target = libname + '.objlist' @@ -155,7 +155,7 @@ def SAMBA_LIBRARY(bld, libname, source, hide_symbols = hide_symbols, local_include = local_include) - if libname == obj_target: + if BUILTIN_LIBRARY(bld, libname): return if not SET_TARGET_TYPE(bld, libname, target_type): diff --git a/lib/replace/wscript b/lib/replace/wscript index 5773912..9cdfd7f 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -364,7 +364,11 @@ def build(bld): bld.SAMBA_LIBRARY('replace', source=REPLACE_SOURCE, group='base_libraries', - hide_symbols=bld.BUILTIN_LIBRARY('replace'), + # FIXME: Ideally symbols should be hidden here so they + # don't appear in the global namespace when Samba + # libraries are loaded, but this doesn't appear to work + # at the moment: + # hide_symbols=bld.BUILTIN_LIBRARY('replace'), deps='crypt dl nsl socket') TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index 048cea3..37cfce2 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('LDBSAMBA', +bld.SAMBA_SUBSYSTEM('LDBSAMBA', source='ldif_handlers.c ldb_wrap.c', autoproto='ldif_handlers_proto.h', public_deps='ldb', @@ -10,6 +10,6 @@ bld.SAMBA_LIBRARY('LDBSAMBA', ) -bld.SAMBA_PYTHON('pyldbsamba', 'pyldb.c', +bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c', deps='LDBSAMBA pyparam_util', realname='samba/_ldb.so') diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 19f5322..8b04354 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -98,14 +98,14 @@ def build(bld): abi_file = 'ABI/ldb-%s.sigs' % VERSION - bld.SAMBA_PYTHON('pyldb_util', deps='ldb', - source='pyldb_util.c') + bld.SAMBA_SUBSYSTEM('pyldb_util', deps='ldb', + source='pyldb_util.c', needs_python=True) if not bld.CONFIG_SET('USING_SYSTEM_LDB'): modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}') bld.SAMBA_LIBRARY('ldb', COMMON_SRC + ' ' + LDB_MAP_SRC, - deps='tevent ldb', + deps='tevent', includes='include', public_headers='include/ldb.h include/ldb_errors.h '\ 'include/ldb_module.h include/ldb_handlers.h', diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 47d82f7..39b41f0 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -10,9 +10,10 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG', ) -bld.SAMBA_PYTHON('PROVISION', +bld.SAMBA_SUBSYSTEM('PROVISION', source='provision.c pyparam.c', - deps='LIBPYTHON pyparam_util ldb' + deps='LIBPYTHON pyparam_util ldb PYTALLOC', + needs_python=True, ) @@ -52,8 +53,9 @@ bld.SAMBA_PYTHON('param', ) -bld.SAMBA_PYTHON('pyparam_util', +bld.SAMBA_SUBSYSTEM('pyparam_util', source='pyparam_util.c', - deps='LIBPYTHON' + deps='LIBPYTHON', + needs_python=True ) diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build index af3c6ed..9eed8b8 100644 --- a/source4/scripting/python/wscript_build +++ b/source4/scripting/python/wscript_build @@ -1,16 +1,17 @@ #!/usr/bin/env python -bld.SAMBA_PYTHON('LIBPYTHON', +bld.SAMBA_SUBSYSTEM('LIBPYTHON', source='modules.c', public_deps='EXT_LIB_PYTHON', init_function_sentinal='{NULL,NULL}', - deps='PYTALLOC', + needs_python=True, ) -bld.SAMBA_PYTHON('PYTALLOC', +bld.SAMBA_SUBSYSTEM('PYTALLOC', source='../../../lib/talloc/pytalloc.c', - public_deps='EXT_LIB_PYTHON talloc' + public_deps='EXT_LIB_PYTHON talloc', + needs_python=True, ) diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build index b7ff441..7064831 100644 --- a/source4/web_server/wscript_build +++ b/source4/web_server/wscript_build @@ -1,9 +1,10 @@ #!/usr/bin/env python -bld.SAMBA_PYTHON('WEB_WSGI', +bld.SAMBA_SUBSYSTEM('WEB_WSGI', source='wsgi.c', - deps='talloc LIBTSOCKET' + deps='talloc LIBTSOCKET', + needs_python=True ) diff --git a/source4/wscript b/source4/wscript index 2be159c..e973d6f 100644 --- a/source4/wscript +++ b/source4/wscript @@ -31,7 +31,7 @@ Options.default_prefix = '/usr/local/samba' def set_options(opt): - opt.BUILTIN_DEFAULT('NONE') + opt.BUILTIN_DEFAULT('replace') opt.BUNDLED_EXTENSION_DEFAULT('samba4') opt.RECURSE('../lib/replace') opt.RECURSE('dynconfig') -- Samba Shared Repository