From: Alexander Bokovoy Date: Mon, 3 Sep 2018 10:04:58 +0000 (+0300) Subject: buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name X-Git-Tag: tdb-1.3.17~1779 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72c3ff9ae2090652e9f3e77374494103e1fd2723;p=thirdparty%2Fsamba.git buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name waflib.Build provides CACHE_SUFFIX constant to append to the target name. We have a reference to samba-specific cache suffix (.cache.py) while original WAF uses _cache.py as a cache suffix since 2011 (see commit 44a967e326cc2e670a31b3712e4763b72d65e81b in WAF project code). Signed-off-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 38756cc74f9..30e99432d1b 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -8,6 +8,7 @@ from waflib.TaskGen import feature, before, after from waflib.Configure import ConfigurationContext from waflib.Logs import debug from waflib import ConfigSet +from waflib.Build import CACHE_SUFFIX # TODO: make this a --option LIB_PATH="shared" @@ -393,7 +394,7 @@ def LOAD_ENVIRONMENT(): from new commands''' env = ConfigSet.ConfigSet() try: - p = os.path.join(Context.g_module.out, 'c4che/default_cache.py') + p = os.path.join(Context.g_module.out, 'c4che/default'+CACHE_SUFFIX) env.load(p) except (OSError, IOError): pass