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

PY3: switch current build to use python3

Browse Source 
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>
This commit is contained in:
Noel Power 2018-11-24 15:27:45 +00:00 committed by Noel Power
parent 3e017aa7e5
commit a660b7fb8e
14 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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)

2
configure vendored
View File

@ -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
ctdb/Makefile
View File

@ -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

2
ctdb/configure vendored
View File

@ -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
lib/ldb/Makefile
View File

@ -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

2
lib/ldb/configure vendored
View File

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

4
lib/replace/Makefile
View File

@ -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

2
lib/replace/configure vendored
View File

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

4
lib/talloc/Makefile
View File

@ -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

2
lib/talloc/configure vendored
View File

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

4
lib/tdb/Makefile
View File

@ -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

2
lib/tdb/configure vendored
View File

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

5
lib/tevent/Makefile
View File

@ -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

2
lib/tevent/configure vendored
View File

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