diff options
| author | Stefan Metzmacher <metze@samba.org> | 2022-03-28 12:59:12 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2022-03-29 22:32:32 +0000 |
| commit | 22c46d9f41876d9ec7187148e658d1692bf37cdd (patch) | |
| tree | 7af663a64c78a033fbbe4b7cf5e01ecb8135bb17 /buildtools | |
| parent | a6b1e4b5766205b7337e0e4b00944184289bfc36 (diff) | |
| download | samba-22c46d9f41876d9ec7187148e658d1692bf37cdd.tar.gz | |
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>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/scripts/Makefile.waf | 4 | ||||
| -rwxr-xr-x | buildtools/scripts/configure.waf | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index 5fc939c99e0..a15a5f87607 100644 --- 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 a7d8d1dbd64..ccb62849a54 100755 --- 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 |