build: Workaround python3 hash order issues (for now)

This works around python3 having a new hash seed each time it starts to allow a second "make" not to rebuild the world. This should probably be reverted once we find the hash that is causing the issue, but should reduce frustration for now. Signed-off-by: Andrew Bartlett <[email protected]> Reviewed-by: Douglas Bagnall <[email protected]>
remicollet · Dec 13, 2018 · 19a4d3c · 19a4d3c
1 parent a42f18c
commit 19a4d3c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build

diff --git a/lib/ldb/Makefile b/lib/ldb/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build

diff --git a/lib/replace/Makefile b/lib/replace/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build

diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build

diff --git a/lib/tdb/Makefile b/lib/tdb/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build

diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile
@@ -1,7 +1,7 @@
 # simple makefile wrapper to run waf
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build