The branch, master has been updated via 0ffc4c5 build: Invert --enable-s3build into --disable-s3build via 26a0ba7 lib/util Define samba-util-common only for s3-waf via ad6ee6d build: Move Heimdal/MIT compat build rules to heimdal_build from d00f1fe No longer need to call SMB_VFS_LSTAT - check name hasn't changed above is sufficient.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0ffc4c51ee8cc9147c76d2ab1ba1f2f72c8107ca Author: Andrew Bartlett <abart...@samba.org> Date: Thu Apr 21 20:02:28 2011 +1000 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 <abart...@samba.org> Autobuild-Date: Tue Apr 26 04:27:28 CEST 2011 on sn-devel-104 commit 26a0ba7ee9ee0700746759c046a7e12edb8ecdd9 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Apr 21 17:19:29 2011 +1000 lib/util Define samba-util-common only for s3-waf It causes too much trouble in the top level build. Andrew Bartlett commit ad6ee6d55abaeb0eb4373b148fd7e000bfbff194 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Apr 21 12:28:27 2011 +1000 build: Move Heimdal/MIT compat build rules to heimdal_build This allows top level build rules to rely on these names at all times. Andrew Bartlett ----------------------------------------------------------------------- Summary of changes: lib/util/wscript_build | 35 +++++++++++------------------------ source3/Makefile-smbtorture4 | 2 +- source3/wscript_build | 11 ----------- source4/heimdal_build/wscript_build | 13 +++++++++++++ wscript | 7 ++++--- 5 files changed, 29 insertions(+), 39 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/wscript_build b/lib/util/wscript_build index aad386e..f1bb9e7 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -15,7 +15,7 @@ s4_util_public_deps = 'talloc CHARSET execinfo uid_wrapper' s4_util_public_headers = 'attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h' s4_util_header_path = [ ('dlinklist.h util.h', '.'), ('*', 'util') ] -if bld.env.enable_s3build or bld.env._SAMBA_BUILD_ == 3: +if bld.env._SAMBA_BUILD_ == 3: # as we move files into common between samba-util and samba-util3, move them here. # Both samba-util and samba-util3 depend on this private library bld.SAMBA_LIBRARY('samba-util-common', @@ -30,30 +30,17 @@ if bld.env.enable_s3build or bld.env._SAMBA_BUILD_ == 3: private_library=True ) - if bld.env._SAMBA_BUILD_ == 4: - bld.SAMBA_LIBRARY('samba-util', - source=s4_util_sources, - deps=s4_util_deps + ' samba-util-common', - public_deps=s4_util_public_deps, - public_headers=s4_util_public_headers, - header_path= s4_util_header_path, - local_include=False, - vnum='0.0.1', - pc_files='samba-util.pc' - ) - else: - if bld.env._SAMBA_BUILD_ == 4: - bld.SAMBA_LIBRARY('samba-util', - source=s4_util_sources + " " + common_util_sources, - deps=s4_util_deps, - public_deps=s4_util_public_deps + ' ' + common_util_public_deps, - public_headers=s4_util_public_headers + ' ' + common_util_headers, - header_path= s4_util_header_path, - local_include=False, - vnum='0.0.1', - pc_files='samba-util.pc' - ) + bld.SAMBA_LIBRARY('samba-util', + source=s4_util_sources + " " + common_util_sources, + deps=s4_util_deps, + public_deps=s4_util_public_deps + ' ' + common_util_public_deps, + public_headers=s4_util_public_headers + ' ' + common_util_headers, + header_path= s4_util_header_path, + local_include=False, + vnum='0.0.1', + pc_files='samba-util.pc' + ) # dummy subsystem for avoid wider deps changes. bld.SAMBA_SUBSYSTEM('samba-util-common', diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4 index 4a1bed7..3e23b05 100644 --- a/source3/Makefile-smbtorture4 +++ b/source3/Makefile-smbtorture4 @@ -6,7 +6,7 @@ SAMBA4_BINARIES="smbtorture,ndrdump" samba4-configure: @(cd .. && \ CFLAGS='' $(WAF) reconfigure || \ - CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure ) + CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --disable-s3build) .PHONY: samba4-configure diff --git a/source3/wscript_build b/source3/wscript_build index 7a01a7a..dc01554 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1321,17 +1321,6 @@ if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') -else: - - # point the s3 rules at in-tree heimdal - bld.SAMBA3_SUBSYSTEM('gssapi_krb5', - source='', - deps='gssapi krb5') - bld.SAMBA3_SUBSYSTEM('k5crypto', - source='', - deps='krb5') - - ########################## INCLUDES ################################# diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index a1bd478..b52acd6 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -621,6 +621,13 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"): version.c warn.c krb5_err.c heim_err.c k524_err.c krb_err.c''')] + ["../heimdal_build/krb5-glue.c"] + # Alias subsystem to allow common kerberos code that will + # otherwise link against MIT's gssapi_krb5 + HEIMDAL_SUBSYSTEM('gssapi_krb5', + '', + deps='gssapi' + ) + HEIMDAL_LIBRARY('krb5', KRB5_SOURCE, version_script='lib/krb5/version-script.map', includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include', @@ -633,6 +640,12 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"): HEIMDAL_AUTOPROTO('lib/krb5/krb5-protos.h', KRB5_PROTO_SOURCE, options='-E KRB5_LIB -q -P comment -o') + # Alias subsystem to allow common kerberos code that will + # otherwise link against MIT's k5crypto + HEIMDAL_SUBSYSTEM('k5crypto', + '', + deps='krb5') + if not bld.CONFIG_SET("USING_SYSTEM_ASN1"): HEIMDAL_HEIM_ASN1_DER_SOURCE = ''' lib/asn1/der_get.c diff --git a/wscript b/wscript index 6961eb8..46773bf 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') -- Samba Shared Repository