From: Noel Power Date: Thu, 29 Nov 2018 16:51:50 +0000 (+0000) Subject: buildtools/wafsamba: Support --extra-python with python2 X-Git-Tag: tdb-1.3.17~401 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb74e6ad32db46d907bb75ea35107c0e348ed78;p=thirdparty%2Fsamba.git buildtools/wafsamba: Support --extra-python with python2 Relax restriction on extra_python version Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py index 7879a1abd86..419c559848f 100644 --- a/buildtools/wafsamba/samba_python.py +++ b/buildtools/wafsamba/samba_python.py @@ -5,7 +5,7 @@ from waflib import Build, Logs, Utils, Configure, Errors from waflib.Configure import conf @conf -def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,4,2)): +def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,6,0)): # enable tool to build python extensions if conf.env.HAVE_PYTHON_H: conf.check_python_version(version) @@ -21,9 +21,10 @@ def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,4,2)): conf.find_program('python', var='PYTHON', mandatory=True) conf.load('python') try: - conf.check_python_version((3, 3, 0)) + conf.check_python_version(version) except Exception: - Logs.warn('extra-python needs to be Python 3.3 or later') + Logs.warn('extra-python needs to be Python %s.%s.%s or later' % + (version[0], version[1], version[2])) raise interpreters.append(conf.env['PYTHON']) conf.setenv('default')