Skip to content

Commit

Permalink
PY3: switch current build to use python3
Browse files Browse the repository at this point in the history 
Make sure default make and configure for all now defaults
to building with python3.

To build a samba (or sub component e.g. talloc etc.) with python3
  ./configure && make

To build a samba (or sub component e.g. talloc etc.) with python2
  PYTHON=python ./configure && PYTHON=python make

Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
  • Loading branch information
@noelpower
noelpower authored and Noel Power committed Dec 10, 2018
1 parent 3e017aa commit a660b7f
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# simple makefile wrapper to run waf

PYTHON?=python
PYTHON?=python3
WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

Expand Down
2 changes: 1 addition & 1 deletion configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ export JOBS
unset LD_PRELOAD

cd . || exit 1
${PYTHON:=python} $WAF configure "$@" || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
cd $PREVPATH
4 changes: 3 additions & 1 deletion ctdb/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# simple makefile wrapper to run waf

WAF=WAF_MAKE=1 PATH=buildtools/bin:../buildtools/bin:$$PATH waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

all:
$(WAF) build
Expand Down
2 changes: 1 addition & 1 deletion ctdb/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ JOBS=1
export JOBS

cd . || exit 1
${PYTHON:=python} $WAF configure "$@" || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
cd $PREVPATH
4 changes: 3 additions & 1 deletion lib/ldb/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# simple makefile wrapper to run waf

WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

all:
$(WAF) build
Expand Down
2 changes: 1 addition & 1 deletion lib/ldb/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ JOBS=1
export JOBS

cd . || exit 1
$WAF configure "$@" || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
cd $PREVPATH
4 changes: 3 additions & 1 deletion lib/replace/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# simple makefile wrapper to run waf

WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

all:
$(WAF) build
Expand Down
2 changes: 1 addition & 1 deletion lib/replace/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ JOBS=1
export JOBS

cd . || exit 1
$WAF configure "$@" || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
cd $PREVPATH
4 changes: 3 additions & 1 deletion lib/talloc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# simple makefile wrapper to run waf

WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

all:
$(WAF) build
Expand Down
2 changes: 1 addition & 1 deletion lib/talloc/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ JOBS=1
export JOBS

cd . || exit 1
$WAF configure "$@" || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
cd $PREVPATH
4 changes: 3 additions & 1 deletion lib/tdb/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# simple makefile wrapper to run waf

WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

all:
$(WAF) build
Expand Down
2 changes: 1 addition & 1 deletion lib/tdb/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ JOBS=1
export JOBS

cd . || exit 1
$WAF configure "$@" || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
cd $PREVPATH
5 changes: 3 additions & 2 deletions lib/tevent/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# simple makefile wrapper to run waf

WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
PYTHON?=python3
WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)

all:
$(WAF) build
Expand Down
2 changes: 1 addition & 1 deletion lib/tevent/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ JOBS=1
export JOBS

cd . || exit 1
$WAF configure "$@" || exit 1
${PYTHON:=python3} $WAF configure "$@" || exit 1
cd $PREVPATH

0 comments on commit a660b7f

Please sign in to comment.