diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-04-08 17:25:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-04-11 16:44:46 +1000 |
| commit | 7955bf473f63e31566e29299b03d44d9b450d1ae (patch) | |
| tree | e17ca9c4615454de5ae3ae30e6635ac8c1ae506a | |
| parent | afd291b1dee44b2400bed119bccfc0b722d8cc9c (diff) | |
| download | samba-7955bf473f63e31566e29299b03d44d9b450d1ae.tar.gz samba-7955bf473f63e31566e29299b03d44d9b450d1ae.tar.bz2 samba-7955bf473f63e31566e29299b03d44d9b450d1ae.zip | |
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 <mat@matws.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba_python.py | 4 | ||||
| -rw-r--r-- | m4/check_python.m4 | 6 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 6 insertions, 6 deletions
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): diff --git a/m4/check_python.m4 b/m4/check_python.m4 index 9d0524a8e8..66dadbdbaa 100644 --- a/m4/check_python.m4 +++ b/m4/check_python.m4 @@ -43,7 +43,7 @@ dnl $PYTHON_LDFLAGS AC_DEFUN([AC_SAMBA_PYTHON_DEVEL], [ if test -z "$PYTHON_VER"; then - AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python]) + AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python]) else AC_PATH_PROG([PYTHON],[python[$PYTHON_VER]]) fi @@ -91,9 +91,9 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL], sysconfig.get_config_var('LIBPL'))"` TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS) - if `$PYTHON -c "import sys; sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 4))"` + if `$PYTHON -c "import sys; sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 5))"` then - AC_MSG_WARN([Python ($PYTHON) is too old. At least version 2.4 is required]) + AC_MSG_WARN([Python ($PYTHON) is too old. At least version 2.5 is required]) working_python=no fi fi @@ -85,7 +85,7 @@ def configure(conf): conf.find_program('perl', var='PERL', mandatory=True) conf.find_program('xsltproc', var='XSLTPROC') - conf.SAMBA_CHECK_PYTHON(mandatory=True) + conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: |