diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-08-26 23:11:39 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-11-17 21:21:12 +0100 |
| commit | f0cf2c0501eeb540eca8e3ae0123fd9caed31f0f (patch) | |
| tree | bcaba177cdb7df83e430682ae3a1d9e5ad2ac469 /buildtools | |
| parent | ae97d88bda2a40376f8703b3dbd69551de80ead1 (diff) | |
| download | samba-f0cf2c0501eeb540eca8e3ae0123fd9caed31f0f.tar.gz | |
wafsamba: fix dependency for SAMBA_GENERATOR() when passing vars!=None
vars can only be a dictionary as that's the only thing bld.EXPAND_VARIABLES()
accepts.
We need to checksum the whole vars dictionary into the dependencies.
We set task.env.SAMBA_GENERATOR_VARS = vars and add SAMBA_GENERATOR_VARS
to the dep_vars.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit da8c76354549a64181cffc36e1c0bb0c6c4f87d3)
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index fafec1f3ea4..ff97e88ce5a 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -588,11 +588,8 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='', return dep_vars = [] - if isinstance(vars, dict): - dep_vars = vars.keys() - elif isinstance(vars, list): - dep_vars = vars dep_vars.append('ruledeps') + dep_vars.append('SAMBA_GENERATOR_VARS') bld.SET_BUILD_GROUP(group) t = bld( @@ -607,6 +604,10 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='', dep_vars = dep_vars, name=name) + if vars is None: + vars = {} + t.env.SAMBA_GENERATOR_VARS = vars + if always: t.always = True |