From: Noel Power Date: Sat, 24 Nov 2018 15:27:45 +0000 (+0000) Subject: PY3: switch current build to use python3 X-Git-Tag: tdb-1.3.17~407 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=a660b7fb8e519bd3be558fd0425bff8f287fca1f PY3: switch current build to use python3 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 Reviewed-by: Andrew Bartlett --- diff --git a/Makefile b/Makefile index 5cc90771000..4290986a939 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/configure b/configure index a94c835a428..6a89b17e733 100755 --- a/configure +++ b/configure @@ -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 diff --git a/ctdb/Makefile b/ctdb/Makefile index 10ac9ab73cf..142998a9652 100644 --- a/ctdb/Makefile +++ b/ctdb/Makefile @@ -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 diff --git a/ctdb/configure b/ctdb/configure index e8d01577cf7..370ddccb6a5 100755 --- a/ctdb/configure +++ b/ctdb/configure @@ -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 diff --git a/lib/ldb/Makefile b/lib/ldb/Makefile index 5acfcbce58e..75517a774d3 100644 --- a/lib/ldb/Makefile +++ b/lib/ldb/Makefile @@ -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 diff --git a/lib/ldb/configure b/lib/ldb/configure index 82146fe109a..8625206d611 100755 --- a/lib/ldb/configure +++ b/lib/ldb/configure @@ -17,5 +17,5 @@ JOBS=1 export JOBS cd . || exit 1 -$WAF configure "$@" || exit 1 +${PYTHON:=python3} $WAF configure "$@" || exit 1 cd $PREVPATH diff --git a/lib/replace/Makefile b/lib/replace/Makefile index 364990153e5..923605f9a13 100644 --- a/lib/replace/Makefile +++ b/lib/replace/Makefile @@ -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 diff --git a/lib/replace/configure b/lib/replace/configure index 6a9f8755112..69bbc4a1bae 100755 --- a/lib/replace/configure +++ b/lib/replace/configure @@ -17,5 +17,5 @@ JOBS=1 export JOBS cd . || exit 1 -$WAF configure "$@" || exit 1 +${PYTHON:=python3} $WAF configure "$@" || exit 1 cd $PREVPATH diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile index 4c28653446d..b8e6d6ca288 100644 --- a/lib/talloc/Makefile +++ b/lib/talloc/Makefile @@ -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 diff --git a/lib/talloc/configure b/lib/talloc/configure index 6a9f8755112..69bbc4a1bae 100755 --- a/lib/talloc/configure +++ b/lib/talloc/configure @@ -17,5 +17,5 @@ JOBS=1 export JOBS cd . || exit 1 -$WAF configure "$@" || exit 1 +${PYTHON:=python3} $WAF configure "$@" || exit 1 cd $PREVPATH diff --git a/lib/tdb/Makefile b/lib/tdb/Makefile index fe44ff6b569..9066e5ba03e 100644 --- a/lib/tdb/Makefile +++ b/lib/tdb/Makefile @@ -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 diff --git a/lib/tdb/configure b/lib/tdb/configure index 6a9f8755112..69bbc4a1bae 100755 --- a/lib/tdb/configure +++ b/lib/tdb/configure @@ -17,5 +17,5 @@ JOBS=1 export JOBS cd . || exit 1 -$WAF configure "$@" || exit 1 +${PYTHON:=python3} $WAF configure "$@" || exit 1 cd $PREVPATH diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile index 5acfcbce58e..8bbf3cdbab7 100644 --- a/lib/tevent/Makefile +++ b/lib/tevent/Makefile @@ -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 diff --git a/lib/tevent/configure b/lib/tevent/configure index 15ad1a57f16..df0bdac0ed0 100755 --- a/lib/tevent/configure +++ b/lib/tevent/configure @@ -17,5 +17,5 @@ JOBS=1 export JOBS cd . || exit 1 -$WAF configure "$@" || exit 1 +${PYTHON:=python3} $WAF configure "$@" || exit 1 cd $PREVPATH