Skip to content

Commit 22c46d9

Browse files
metze-sambaabartlet
authored andcommitted
configure/Makefile: export PYTHONHASHSEED=1 in all 'configure/Makefile' scripts
Signed-off-by: Stefan Metzmacher <[email protected]> Reviewed-by: Andrew Bartlett <[email protected]>
1 parent a6b1e4b commit 22c46d9

File tree

10 files changed

+58
-5
lines changed

10 files changed

+58
-5
lines changed

buildtools/scripts/Makefile.waf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# simple makefile wrapper to run waf
22

3-
WAF_BINARY=BUILDTOOLS/bin/waf
4-
WAF=WAF_MAKE=1 $(WAF_BINARY)
3+
WAF_BINARY=$(PYTHON) BUILDTOOLS/bin/waf
4+
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
55

66
all:
77
$(WAF) build

buildtools/scripts/configure.waf

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
PREVPATH=`dirname $0`
3+
PREVPATH=$(dirname $0)
44

55
WAF=BUILDTOOLS/bin/waf
66

@@ -9,6 +9,13 @@ WAF=BUILDTOOLS/bin/waf
99
JOBS=1
1010
export JOBS
1111

12+
# Make sure we don't have any library preloaded.
13+
unset LD_PRELOAD
14+
15+
# Make sure we get stable hashes
16+
PYTHONHASHSEED=1
17+
export PYTHONHASHSEED
18+
1219
cd BUILDPATH || exit 1
13-
$WAF configure "$@" || exit 1
20+
$PYTHON $WAF configure "$@" || exit 1
1421
cd $PREVPATH

configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ export JOBS
1212
# Make sure we don't have any library preloaded.
1313
unset LD_PRELOAD
1414

15+
# Make sure we get stable hashes
16+
PYTHONHASHSEED=1
17+
export PYTHONHASHSEED
18+
1519
cd . || exit 1
1620
$PYTHON $WAF configure "$@" || exit 1
1721
cd $PREVPATH

ctdb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# simple makefile wrapper to run waf
22

33
WAF_BINARY=$(PYTHON) ../buildtools/bin/waf
4-
WAF=WAF_MAKE=1 $(WAF_BINARY)
4+
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
55

66
all:
77
$(WAF) build

ctdb/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ WAF=buildtools/bin/waf
1010
JOBS=1
1111
export JOBS
1212

13+
# Make sure we don't have any library preloaded.
14+
unset LD_PRELOAD
15+
16+
# Make sure we get stable hashes
17+
PYTHONHASHSEED=1
18+
export PYTHONHASHSEED
19+
1320
cd . || exit 1
1421
$PYTHON $WAF configure "$@" || exit 1
1522
cd $PREVPATH

lib/ldb/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ fi
1616
JOBS=1
1717
export JOBS
1818

19+
# Make sure we don't have any library preloaded.
20+
unset LD_PRELOAD
21+
22+
# Make sure we get stable hashes
23+
PYTHONHASHSEED=1
24+
export PYTHONHASHSEED
25+
1926
cd . || exit 1
2027
$PYTHON $WAF configure "$@" || exit 1
2128
cd $PREVPATH

lib/replace/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ fi
1616
JOBS=1
1717
export JOBS
1818

19+
# Make sure we don't have any library preloaded.
20+
unset LD_PRELOAD
21+
22+
# Make sure we get stable hashes
23+
PYTHONHASHSEED=1
24+
export PYTHONHASHSEED
25+
1926
cd . || exit 1
2027
$PYTHON $WAF configure "$@" || exit 1
2128
cd $PREVPATH

lib/talloc/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ fi
1616
JOBS=1
1717
export JOBS
1818

19+
# Make sure we don't have any library preloaded.
20+
unset LD_PRELOAD
21+
22+
# Make sure we get stable hashes
23+
PYTHONHASHSEED=1
24+
export PYTHONHASHSEED
25+
1926
cd . || exit 1
2027
$PYTHON $WAF configure "$@" || exit 1
2128
cd $PREVPATH

lib/tdb/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ fi
1616
JOBS=1
1717
export JOBS
1818

19+
# Make sure we don't have any library preloaded.
20+
unset LD_PRELOAD
21+
22+
# Make sure we get stable hashes
23+
PYTHONHASHSEED=1
24+
export PYTHONHASHSEED
25+
1926
cd . || exit 1
2027
$PYTHON $WAF configure "$@" || exit 1
2128
cd $PREVPATH

lib/tevent/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ fi
1616
JOBS=1
1717
export JOBS
1818

19+
# Make sure we don't have any library preloaded.
20+
unset LD_PRELOAD
21+
22+
# Make sure we get stable hashes
23+
PYTHONHASHSEED=1
24+
export PYTHONHASHSEED
25+
1926
cd . || exit 1
2027
$PYTHON $WAF configure "$@" || exit 1
2128
cd $PREVPATH

0 commit comments

Comments
 (0)