From: Stefan Metzmacher Date: Thu, 15 Nov 2018 10:41:07 +0000 (+0100) Subject: wafsamba: remove the need of BuildContext.bdir X-Git-Tag: tdb-1.3.17~736 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e1135f99b34712fe4cce8039d2bb82df131ce40;p=thirdparty%2Fsamba.git wafsamba: remove the need of BuildContext.bdir Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 542e682619c..d6b7c0f88d6 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -1011,14 +1011,14 @@ def save_samba_deps(bld, tgt_list): if tdeps != {}: denv.outenv[t.sname] = tdeps - depsfile = os.path.join(bld.bdir, "sambadeps") + depsfile = os.path.join(bld.cache_dir, "sambadeps") denv.store_fast(depsfile) def load_samba_deps(bld, tgt_list): '''load a previous set of build dependencies if possible''' - depsfile = os.path.join(bld.bldnode.abspath(), "sambadeps") + depsfile = os.path.join(bld.cache_dir, "sambadeps") denv = ConfigSet.ConfigSet() try: debug('deps: checking saved dependencies') diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py index 26441309d4f..f2a2ba7fb5d 100644 --- a/buildtools/wafsamba/samba_waf18.py +++ b/buildtools/wafsamba/samba_waf18.py @@ -44,7 +44,6 @@ for y in (Build.BuildContext, Build.CleanContext, Build.InstallContext, Build.Un def pre_build(self): self.cwdx = self.bldnode.parent self.cwd = self.cwdx.abspath() - self.bdir = self.bldnode.abspath() return Build.BuildContext.old_pre_build(self) Build.BuildContext.old_pre_build = Build.BuildContext.pre_build Build.BuildContext.pre_build = pre_build