From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 13 Dec 2018 00:06:48 +0000 (+1300)
Subject: build: Workaround python3 hash order issues (for now)
X-Git-Tag: tdb-1.3.17~349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19a4d3ca692e864a2ae6c8c496e7eb08cded612f;p=thirdparty%2Fsamba.git

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 <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/Makefile b/Makefile
index 4290986a939..c13843d3a4b 100644
--- 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
index 75517a774d3..0ac14aae74e 100644
--- 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
index 923605f9a13..3e54a16927c 100644
--- 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
index b8e6d6ca288..7cfac0cafc9 100644
--- 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
index 9066e5ba03e..0f088ea2231 100644
--- 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
index 8bbf3cdbab7..989f4b9845c 100644
--- 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