diff options
| author | Noel Power <noel.power@suse.com> | 2018-11-29 16:51:50 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:25 +0100 |
| commit | 2fb74e6ad32db46d907bb75ea35107c0e348ed78 (patch) | |
| tree | 243391c70698ed57de17b904615ffe0704217a22 /buildtools | |
| parent | dfe5787c255eaab3d8022c972a1afa1dd83e62ef (diff) | |
| download | samba-2fb74e6ad32db46d907bb75ea35107c0e348ed78.tar.gz | |
buildtools/wafsamba: Support --extra-python with python2
Relax restriction on extra_python version
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_python.py | 7 |
1 files changed, 4 insertions, 3 deletions
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') |