From 7955bf473f63e31566e29299b03d44d9b450d1ae Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 8 Apr 2013 17:25:27 +1000 Subject: build: Raise minimum python version to 2.5.0 for samba build RHEL5 has a python26 package for a modern python, and was the main reason we kept python 2.5 support. However, this support never actually worked for AD DC installations, as samba-tool uses a feature only in 2.5 and above. Very few folks noticed and those were on RHEL5, and moving to 2.5 allows us to remove some other workarounds. Andrew Bartlett Reviewed-by: Matthieu Patou Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_python.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildtools/wafsamba') diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py index 847b431f7d..aee9547e39 100644 --- a/buildtools/wafsamba/samba_python.py +++ b/buildtools/wafsamba/samba_python.py @@ -7,13 +7,13 @@ from samba_autoconf import * from Configure import conf @conf -def SAMBA_CHECK_PYTHON(conf, mandatory=True): +def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,4,2)): # enable tool to build python extensions conf.find_program('python', var='PYTHON', mandatory=mandatory) conf.check_tool('python') path_python = conf.find_program('python') conf.env.PYTHON_SPECIFIED = (conf.env.PYTHON != path_python) - conf.check_python_version((2,4,2)) + conf.check_python_version(version) @conf def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True): -- cgit