wafsamba: fix dependencies on environment variables for python_fixup
authorStefan Metzmacher <metze@samba.org>
Tue, 26 Aug 2014 21:14:23 +0000 (23:14 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 5 Sep 2014 17:47:06 +0000 (19:47 +0200)
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>
buildtools/wafsamba/wafsamba.py

index a9a192be9c065d75750a840fa31ec43da1043dbf..a884d6dfecde7064ea42f76bc0b260be89f5b352 100644 (file)
@@ -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)