The branch, master has been updated via a875616... Revert "s4:ldb-samba: fix the build without a system ldb" via e812832... s4:ldb: only do ABI checking for the standalone build for now from 52307a1... libpolicy: Fix the build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a87561613af3e54503f80d559227f836c17ed263 Author: Stefan Metzmacher <me...@samba.org> Date: Sun Jun 20 16:22:46 2010 +0200 Revert "s4:ldb-samba: fix the build without a system ldb" This reverts commit 44c01a5eb45a0cd5ca3de8be5c4680de75418dce. This caused problems when using a system ldb and as we don't do ABI checks for ldb-samba4 any more, we don't need this change. metze Signed-off-by: Jelmer Vernooij <jel...@samba.org> commit e812832db347269e46b28af31ff7ba3301405117 Author: Stefan Metzmacher <me...@samba.org> Date: Sun Jun 20 16:13:38 2010 +0200 s4:ldb: only do ABI checking for the standalone build for now Otherwise we fail to build samba4 with a system ldb. metze Signed-off-by: Jelmer Vernooij <jel...@samba.org> ----------------------------------------------------------------------- Summary of changes: source4/lib/ldb-samba/wscript_build | 5 ---- source4/lib/ldb/wscript | 36 +++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index 970f495..a58316e 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -4,11 +4,6 @@ # as a built-in module and this delutes the symbols in the ldb library with # the symbols of all of ldb_ildap's dependencies. -# However, LDBSAMBA has to be a subsystem, otherwise we end up with an unusable -# build when building against the system ldb. - -# When adding/modifying public symbols in LDBSAMBA, please make sure that -# lib/ldb/ABI/ldb-samba-X.sigs gets updated. bld.SAMBA_SUBSYSTEM('LDBSAMBA', source='ldif_handlers.c ldb_wrap.c', autoproto='ldif_handlers_proto.h', diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index df2245f..588b6fe 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -108,18 +108,30 @@ def build(bld): 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', - includes='include', - public_headers='include/ldb.h include/ldb_errors.h '\ - 'include/ldb_module.h include/ldb_handlers.h', - pc_files='ldb.pc', - cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir, - abi_file=abi_file, - abi_match='!ldb_*module_ops !ldb_*backend_ops ldb_*', - vnum=VERSION, manpages='man/ldb.3', - is_bundled=not bld.env.standalone_ldb) + if bld.env.standalone_ldb: + bld.SAMBA_LIBRARY('ldb', + COMMON_SRC + ' ' + LDB_MAP_SRC, + deps='tevent', + includes='include', + public_headers='include/ldb.h include/ldb_errors.h '\ + 'include/ldb_module.h include/ldb_handlers.h', + pc_files='ldb.pc', + cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir, + abi_file=abi_file, + abi_match='!ldb_*module_ops !ldb_*backend_ops ldb_*', + vnum=VERSION, manpages='man/ldb.3', + is_bundled=not bld.env.standalone_ldb) + else: + bld.SAMBA_LIBRARY('ldb', + COMMON_SRC + ' ' + LDB_MAP_SRC, + deps='tevent', + includes='include', + public_headers='include/ldb.h include/ldb_errors.h '\ + 'include/ldb_module.h include/ldb_handlers.h', + pc_files='ldb.pc', + cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir, + vnum=VERSION, manpages='man/ldb.3', + is_bundled=not bld.env.standalone_ldb) bld.SAMBA_PYTHON('pyldb', 'pyldb.c', deps='ldb pyldb_util', -- Samba Shared Repository