From b99b51400c3e3e40b848d57d01f67b8d72d772b5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 18 Dec 2018 16:27:14 +1300 Subject: [PATCH] build: Remove --timestamp-dependencies (BROKEN) Remove this code marked as broken, we do not need broken configure options making Samba appear to be more complex than it already is. Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- buildtools/wafsamba/wafsamba.py | 16 ---------------- buildtools/wafsamba/wscript | 6 ------ 2 files changed, 22 deletions(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 230a76d8f2c..a077026c690 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -721,22 +721,6 @@ Build.BuildContext.SET_BUILD_GROUP = SET_BUILD_GROUP -@conf -def ENABLE_TIMESTAMP_DEPENDENCIES(conf): - """use timestamps instead of file contents for deps - this currently doesn't work""" - def h_file(filename): - import stat - st = os.stat(filename) - if stat.S_ISDIR(st[stat.ST_MODE]): raise IOError('not a file') - m = Utils.md5() - m.update(str(st.st_mtime)) - m.update(str(st.st_size)) - m.update(filename) - return m.digest() - Utils.h_file = h_file - - def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None): '''used to copy scripts from the source tree into the build directory for use by selftest''' diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 164a9ff6dda..7b8fb01db5e 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -115,9 +115,6 @@ def options(opt): gr.add_option('--enable-gccdeps', help=("Enable use of gcc -MD dependency module"), action="store_true", dest='enable_gccdeps', default=True) - gr.add_option('--timestamp-dependencies', - help=("use file timestamps instead of content for build dependencies (BROKEN)"), - action="store_true", dest='timestamp_dependencies', default=False) gr.add_option('--pedantic', help=("Enable even more compiler warnings"), action='store_true', dest='pedantic', default=False) @@ -220,9 +217,6 @@ def configure(conf): conf.define('SRCDIR', conf.env['srcdir']) - if Options.options.timestamp_dependencies: - conf.ENABLE_TIMESTAMP_DEPENDENCIES() - conf.SETUP_CONFIGURE_CACHE(Options.options.enable_configure_cache) # load our local waf extensions -- 2.34.1