summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-08-26 23:14:23 +0200
committerStefan Metzmacher <metze@samba.org>2014-09-05 19:47:06 +0200
commit7316653a82fea3dfe1ac8aa89003ce15836a11b9 (patch)
treec309d195d75f8fe2202823ce312c8abc71a8f558
parent04bb8ff7e6a3908b952d4d95edc2c7411611ac33 (diff)
downloadsamba-7316653a82fea3dfe1ac8aa89003ce15836a11b9.tar.gz
samba-7316653a82fea3dfe1ac8aa89003ce15836a11b9.tar.xz
samba-7316653a82fea3dfe1ac8aa89003ce15836a11b9.zip
wafsamba: fix dependencies on environment variables for python_fixup
We now checksum the sourcecode of copy_and_fix_python_path() and the env variables used by this function. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--buildtools/wafsamba/wafsamba.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index a9a192be9c..a884d6dfec 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -750,12 +750,9 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
inst_file = file + '.inst'
bld.SAMBA_GENERATOR('python_%s' % destname,
rule=copy_and_fix_python_path,
+ dep_vars=["PYTHON","PYTHON_SPECIFIED","PYTHONDIR","PYTHONARCHDIR"],
source=file,
target=inst_file)
- bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONARCHDIR"])
- bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONDIR"])
- bld.add_manual_dependency(bld.path.find_or_declare(inst_file), str(bld.env["PYTHON_SPECIFIED"]))
- bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHON"])
file = inst_file
if base_name:
file = os.path.join(base_name, file)