configure/Makefile: export PYTHONHASHSEED=1 in all 'configure/Makefile' scripts

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index 5fc939c99e03612916e929f09d7bd7e989349fc3..a15a5f87607ee9c8088e1afa972516ea907bdfca 100644 (file)
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -1,7 +1,7 @@
 # simple makefile wrapper to run waf
 
-WAF_BINARY=BUILDTOOLS/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF_BINARY=$(PYTHON) BUILDTOOLS/bin/waf
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
        $(WAF) build

diff --git a/buildtools/scripts/configure.waf b/buildtools/scripts/configure.waf
index a7d8d1dbd64183bf6ec60794985bdc7fa7ee85f2..ccb62849a54f49e3c3d41f92a7581bf9c042a694 100755 (executable)
--- a/buildtools/scripts/configure.waf
+++ b/buildtools/scripts/configure.waf
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREVPATH=`dirname $0`
+PREVPATH=$(dirname $0)
 
 WAF=BUILDTOOLS/bin/waf
 
@@ -9,6 +9,13 @@ WAF=BUILDTOOLS/bin/waf
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd BUILDPATH || exit 1
-$WAF configure "$@" || exit 1
+$PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH

diff --git a/configure b/configure
index 237d2306f79a85127f7b4cfd90410c3409de7c03..ef80911d944ccde7a262c78f1c9d400d36edccdc 100755 (executable)
--- a/configure
+++ b/configure
@@ -12,6 +12,10 @@ export JOBS
 # Make sure we don't have any library preloaded.
 unset LD_PRELOAD
 
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH

diff --git a/ctdb/Makefile b/ctdb/Makefile
index ec362e2940827160b65164b6d01ae2f0d4171139..5dbc7acdc54e2a9fa69e635526322c99d629d9e6 100644 (file)
--- a/ctdb/Makefile
+++ b/ctdb/Makefile
@@ -1,7 +1,7 @@
 # simple makefile wrapper to run waf
 
 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/ctdb/configure b/ctdb/configure
index dbb0c1446b512d3fd85864d9b9b5272f46fd8a91..48b786b1612d3e9f53e421c60a01fb1c6a383260 100755 (executable)
--- a/ctdb/configure
+++ b/ctdb/configure
@@ -10,6 +10,13 @@ WAF=buildtools/bin/waf
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH

diff --git a/lib/ldb/configure b/lib/ldb/configure
index 8979f07581bb35af294646f05f26c9a14f6074a1..2ed32403fd739da4fedb0831962ef168acbfa6d5 100755 (executable)
--- a/lib/ldb/configure
+++ b/lib/ldb/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH

diff --git a/lib/replace/configure b/lib/replace/configure
index d0ab6685fbe7138482cc7fae66f5863fb605d9de..af761854ef49fa6134cad849f26df60d65e3c772 100755 (executable)
--- a/lib/replace/configure
+++ b/lib/replace/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH

diff --git a/lib/talloc/configure b/lib/talloc/configure
index d0ab6685fbe7138482cc7fae66f5863fb605d9de..af761854ef49fa6134cad849f26df60d65e3c772 100755 (executable)
--- a/lib/talloc/configure
+++ b/lib/talloc/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH

diff --git a/lib/tdb/configure b/lib/tdb/configure
index d0ab6685fbe7138482cc7fae66f5863fb605d9de..af761854ef49fa6134cad849f26df60d65e3c772 100755 (executable)
--- a/lib/tdb/configure
+++ b/lib/tdb/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH

diff --git a/lib/tevent/configure b/lib/tevent/configure
index 63e4a2a00b5ad47994556c8a1b3d140a746385d8..7b972bd0bc85001b82e717ad111a26bacc7e814a 100755 (executable)
--- a/lib/tevent/configure
+++ b/lib/tevent/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH