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 <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/Makefile b/Makefile
index 5cc907710001b47fd459c5edbf6a56647d5d7486..4290986a939ee4eb4bbed775a5f5ca894dd824bd 100644 (file)
--- 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 a94c835a42859f19cb141cc90e9e64c9936c9b56..6a89b17e73301e71e2a4763f7aac21956c8af879 100755 (executable)
--- 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 10ac9ab73cfacc23c108a1e63aeea55a4f5c2b90..142998a96525a461f97f07079a01c03478c8e68f 100644 (file)
--- 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 e8d01577cf7de6edb82c586161641cb45ee95926..370ddccb6a5630759d21a6292e1c514b139d547b 100755 (executable)
--- 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 5acfcbce58e893ea4bbccb56dda739a891be485d..75517a774d3298b31da8c03c4f999be72e38df19 100644 (file)
--- 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 82146fe109afbd14f8cb86aeae21f0cfed9340a7..8625206d611bc62fb8d56b03dd6426d60206e018 100755 (executable)
--- 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 364990153e5374aa238073425f896879303cfad3..923605f9a134e6070616fdd1e0f82821487b4887 100644 (file)
--- 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 6a9f8755112af7c1f7253912bbc0079655546725..69bbc4a1bae392f891b0b54a67a9c8c38d59991b 100755 (executable)
--- 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 4c28653446d031d9ed169ff79fa6d9f4da1e9ad9..b8e6d6ca2880a55124ce595cb47caaac405130bd 100644 (file)
--- 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 6a9f8755112af7c1f7253912bbc0079655546725..69bbc4a1bae392f891b0b54a67a9c8c38d59991b 100755 (executable)
--- 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 fe44ff6b5698445b14e082054c2282bc995158b4..9066e5ba03ef8af0e92f6aa5c949f224094b0f32 100644 (file)
--- 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 6a9f8755112af7c1f7253912bbc0079655546725..69bbc4a1bae392f891b0b54a67a9c8c38d59991b 100755 (executable)
--- 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 5acfcbce58e893ea4bbccb56dda739a891be485d..8bbf3cdbab7dd23cf2616fe0aa84b7deb2862553 100644 (file)
--- 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 15ad1a57f1656b492aeda3c36dd7c3ce1cd6ec80..df0bdac0ed09dead4273861943c3ab389ba2ba3e 100755 (executable)
--- 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