sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

build: Move python detection back into waf (instead of in configure and Makefile)

Browse Source 
This avoids creating a mini-configure in the configure script.

Users wishing to use python2 to build need to specify PYTHON=
to both ./configure and make

After we merged the python3 change, it became clear that relying on systems prefixing
the correct python just causes trouble and make debugging harder, so only use $PYTHON
for the override, not the default case

This essentially reverts a660b7fb8e but
leaves the files more consistent.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Andrew Bartlett 2018-12-12 07:10:30 +13:00 committed by Noel Power
parent 31957c7fe9
commit 5ddff307b4
15 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -1,6 +1,5 @@
# simple makefile wrapper to run waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)

2
buildtools/bin/waf vendored
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
# encoding: latin-1
# Thomas Nagy, 2005-2018
#

2
configure vendored
View File

@ -13,5 +13,5 @@ export JOBS
unset LD_PRELOAD
cd . || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
$PYTHON $WAF configure "$@" || exit 1
cd $PREVPATH

1
ctdb/Makefile
View File

@ -1,6 +1,5 @@
# simple makefile wrapper to run waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

2
ctdb/configure vendored
View File

@ -11,5 +11,5 @@ JOBS=1
export JOBS
cd . || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
$PYTHON $WAF configure "$@" || exit 1
cd $PREVPATH

1
lib/ldb/Makefile
View File

@ -1,6 +1,5 @@
# simple makefile wrapper to run waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)

2
lib/ldb/configure vendored
View File

@ -17,5 +17,5 @@ JOBS=1
export JOBS
cd . || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
$PYTHON $WAF configure "$@" || exit 1
cd $PREVPATH

1
lib/replace/Makefile
View File

@ -1,6 +1,5 @@
# simple makefile wrapper to run waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)

2
lib/replace/configure vendored
View File

@ -17,5 +17,5 @@ JOBS=1
export JOBS
cd . || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
$PYTHON $WAF configure "$@" || exit 1
cd $PREVPATH

1
lib/talloc/Makefile
View File

@ -1,6 +1,5 @@
# simple makefile wrapper to run waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)

2
lib/talloc/configure vendored
View File

@ -17,5 +17,5 @@ JOBS=1
export JOBS
cd . || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
$PYTHON $WAF configure "$@" || exit 1
cd $PREVPATH

1
lib/tdb/Makefile
View File

@ -1,6 +1,5 @@
# simple makefile wrapper to run waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)

2
lib/tdb/configure vendored
View File

@ -17,5 +17,5 @@ JOBS=1
export JOBS
cd . || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
$PYTHON $WAF configure "$@" || exit 1
cd $PREVPATH

1
lib/tevent/Makefile
View File

@ -1,5 +1,4 @@
# simple makefile wrapper to run waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)

2
lib/tevent/configure vendored
View File

@ -17,5 +17,5 @@ JOBS=1
export JOBS
cd . || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
$PYTHON $WAF configure "$@" || exit 1
cd $PREVPATH