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 4290986a939ee4eb4bbed775a5f5ca894dd824bd..c13843d3a4b59b7e00a0acf84e2a6fe33b2aadb7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ./buildtools/bin/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
 
 all:
        $(WAF) build

diff --git a/lib/ldb/Makefile b/lib/ldb/Makefile
index 75517a774d3298b31da8c03c4f999be72e38df19..0ac14aae74e46234580f472dcf8cdc042edce0e8 100644 (file)
--- a/lib/ldb/Makefile
+++ b/lib/ldb/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/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
 
 all:
        $(WAF) build

diff --git a/lib/replace/Makefile b/lib/replace/Makefile
index 923605f9a134e6070616fdd1e0f82821487b4887..3e54a16927cf422a3eefc7ae856e7944c8412732 100644 (file)
--- a/lib/replace/Makefile
+++ b/lib/replace/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/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
 
 all:
        $(WAF) build

diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
index b8e6d6ca2880a55124ce595cb47caaac405130bd..7cfac0cafc96b50b2878b93b9bedb5243747c724 100644 (file)
--- a/lib/talloc/Makefile
+++ b/lib/talloc/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/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
 
 all:
        $(WAF) build

diff --git a/lib/tdb/Makefile b/lib/tdb/Makefile
index 9066e5ba03ef8af0e92f6aa5c949f224094b0f32..0f088ea2231149335c8246aa7cc582e83aa26732 100644 (file)
--- a/lib/tdb/Makefile
+++ b/lib/tdb/Makefile
@@ -2,7 +2,7 @@
 
 PYTHON?=python3
 WAF_BINARY=$(PYTHON) ../../buildtools/bin/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
 
 all:
        $(WAF) build

diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile
index 8bbf3cdbab7dd23cf2616fe0aa84b7deb2862553..989f4b9845caa16533bef4b135d27a9f345c4094 100644 (file)
--- 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
 # 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
 
 all:
        $(WAF) build