[llvm] r224129 - Require python 2.7.
Robinson, Paul
Paul_Robinson at playstation.sony.com
Fri Dec 12 10:42:28 PST 2014
Is there corresponding cmake work to do?
> -----Original Message-----
> From: llvm-commits-bounces at cs.uiuc.edu [mailto:llvm-commits-
> bounces at cs.uiuc.edu] On Behalf Of Rafael Espindola
> Sent: Friday, December 12, 2014 7:30 AM
> To: llvm-commits at cs.uiuc.edu
> Subject: [llvm] r224129 - Require python 2.7.
>
> Author: rafael
> Date: Fri Dec 12 09:29:31 2014
> New Revision: 224129
>
> URL: http://llvm.org/viewvc/llvm-project?rev=224129&view=rev
> Log:
> Require python 2.7.
>
> We were already requiring 2.5, which meant that people on old linux
> distros
> had to upgrade anyway.
>
> Requiring python 2.6 will make supporting 3.X easier as we can use the 3.X
> exception syntax.
>
> According to the discussion on llvmdev, there is not much value is
> requiring
> just 2.6, we may as well just require 2.7.
>
> Modified:
> llvm/trunk/autoconf/configure.ac
> llvm/trunk/configure
> llvm/trunk/docs/GettingStarted.rst
> llvm/trunk/docs/GettingStartedVS.rst
> llvm/trunk/docs/TestingGuide.rst
> llvm/trunk/utils/lit/tests/test-output.py
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/autoconf/configure.ac?rev=224129&r1=224128&r2=224129&vi
> ew=diff
> ==========================================================================
> ====
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Fri Dec 12 09:29:31 2014
> @@ -1421,23 +1421,23 @@ else
> AC_MSG_WARN([specified python ($PYTHON) is not usable, searching
> path])
> fi
>
> - AC_PATH_PROG([PYTHON], [python python2 python26],
> + AC_PATH_PROG([PYTHON], [python python2 python27],
> [AC_MSG_RESULT([not found])
> - AC_MSG_ERROR([could not find python 2.5 or higher])])
> + AC_MSG_ERROR([could not find python 2.7 or higher])])
> fi
>
> -AC_MSG_CHECKING([for python >= 2.5])
> +AC_MSG_CHECKING([for python >= 2.7])
> ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
> ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
> ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
> ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
> if test "$ac_python_version_major" -gt "2" || \
> (test "$ac_python_version_major" -eq "2" && \
> - test "$ac_python_version_minor" -ge "5") ; then
> + test "$ac_python_version_minor" -ge "7") ; then
> AC_MSG_RESULT([$PYTHON ($ac_python_version)])
> else
> AC_MSG_RESULT([not found])
> - AC_MSG_FAILURE([found python $ac_python_version ($PYTHON); required >=
> 2.5])
> + AC_MSG_FAILURE([found python $ac_python_version ($PYTHON); required >=
> 2.7])
> fi
>
> dnl===-------------------------------------------------------------------
> ----===
>
> Modified: llvm/trunk/configure
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/configure?rev=224129&r1=224128&r2=224129&view=diff
> ==========================================================================
> ====
> --- llvm/trunk/configure (original)
> +++ llvm/trunk/configure Fri Dec 12 09:29:31 2014
> @@ -8159,8 +8159,8 @@ else
> echo "$as_me: WARNING: specified python ($PYTHON) is not usable,
> searching path" >&2;}
> fi
>
> - # Extract the first word of "python python2 python26", so it can be a
> program name with args.
> -set dummy python python2 python26; ac_word=$2
> + # Extract the first word of "python python2 python27", so it can be a
> program name with args.
> +set dummy python python2 python27; ac_word=$2
> { echo "$as_me:$LINENO: checking for $ac_word" >&5
> echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
> if test "${ac_cv_path_PYTHON+set}" = set; then
> @@ -8188,8 +8188,8 @@ IFS=$as_save_IFS
>
> test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo
> "$as_me:$LINENO: result: not found" >&5
> echo "${ECHO_T}not found" >&6; }
> - { { echo "$as_me:$LINENO: error: could not find python
> 2.5 or higher" >&5
> -echo "$as_me: error: could not find python 2.5 or higher" >&2;}
> + { { echo "$as_me:$LINENO: error: could not find python
> 2.7 or higher" >&5
> +echo "$as_me: error: could not find python 2.7 or higher" >&2;}
> { (exit 1); exit 1; }; }"
> ;;
> esac
> @@ -8206,23 +8206,23 @@ fi
>
> fi
>
> -{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
> -echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
> +{ echo "$as_me:$LINENO: checking for python >= 2.7" >&5
> +echo $ECHO_N "checking for python >= 2.7... $ECHO_C" >&6; }
> ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
> ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
> ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
> ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
> if test "$ac_python_version_major" -gt "2" || \
> (test "$ac_python_version_major" -eq "2" && \
> - test "$ac_python_version_minor" -ge "5") ; then
> + test "$ac_python_version_minor" -ge "7") ; then
> { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
> echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
> else
> { echo "$as_me:$LINENO: result: not found" >&5
> echo "${ECHO_T}not found" >&6; }
> - { { echo "$as_me:$LINENO: error: found python $ac_python_version
> ($PYTHON); required >= 2.5
> + { { echo "$as_me:$LINENO: error: found python $ac_python_version
> ($PYTHON); required >= 2.7
> See \`config.log' for more details." >&5
> -echo "$as_me: error: found python $ac_python_version ($PYTHON); required
> >= 2.5
> +echo "$as_me: error: found python $ac_python_version ($PYTHON); required
> >= 2.7
> See \`config.log' for more details." >&2;}
> { (exit 1); exit 1; }; }
> fi
>
> Modified: llvm/trunk/docs/GettingStarted.rst
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/docs/GettingStarted.rst?rev=224129&r1=224128&r2=224129&
> view=diff
> ==========================================================================
> ====
> --- llvm/trunk/docs/GettingStarted.rst (original)
> +++ llvm/trunk/docs/GettingStarted.rst Fri Dec 12 09:29:31 2014
> @@ -164,7 +164,7 @@ Package
> =========================================================== ============
> ==========================================
> `GNU Make <http://savannah.gnu.org/projects/make>`_ 3.79, 3.79.1
> Makefile/build processor
> `GCC <http://gcc.gnu.org/>`_ >=4.7.0
> C/C++ compiler\ :sup:`1`
> -`python <http://www.python.org/>`_ >=2.5
> Automated test suite\ :sup:`2`
> +`python <http://www.python.org/>`_ >=2.7
> Automated test suite\ :sup:`2`
> `GNU M4 <http://savannah.gnu.org/projects/m4>`_ 1.4
> Macro processor for configuration\ :sup:`3`
> `GNU Autoconf <http://www.gnu.org/software/autoconf/>`_ 2.60
> Configuration script builder\ :sup:`3`
> `GNU Automake <http://www.gnu.org/software/automake/>`_ 1.9.6
> aclocal macro generator\ :sup:`3`
>
> Modified: llvm/trunk/docs/GettingStartedVS.rst
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/docs/GettingStartedVS.rst?rev=224129&r1=224128&r2=22412
> 9&view=diff
> ==========================================================================
> ====
> --- llvm/trunk/docs/GettingStartedVS.rst (original)
> +++ llvm/trunk/docs/GettingStartedVS.rst Fri Dec 12 09:29:31 2014
> @@ -57,8 +57,8 @@ You will also need the `CMake <http://ww
> generates the project files you will use to build with.
>
> If you would like to run the LLVM tests you will need `Python
> -<http://www.python.org/>`_. Versions 2.4-2.7 are known to work. You will
> need
> -`GnuWin32 <http://gnuwin32.sourceforge.net/>`_ tools, too.
> +<http://www.python.org/>`_. Version 2.7 and newer are known to work. You
> will
> +need `GnuWin32 <http://gnuwin32.sourceforge.net/>`_ tools, too.
>
> Do not install the LLVM directory tree into a path containing spaces
> (e.g.
> ``C:\Documents and Settings\...``) as the configure step will fail.
>
> Modified: llvm/trunk/docs/TestingGuide.rst
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/docs/TestingGuide.rst?rev=224129&r1=224128&r2=224129&vi
> ew=diff
> ==========================================================================
> ====
> --- llvm/trunk/docs/TestingGuide.rst (original)
> +++ llvm/trunk/docs/TestingGuide.rst Fri Dec 12 09:29:31 2014
> @@ -22,7 +22,7 @@ Requirements
> ============
>
> In order to use the LLVM testing infrastructure, you will need all of the
> -software required to build LLVM, as well as `Python <http://python.org>`_
> 2.5 or
> +software required to build LLVM, as well as `Python <http://python.org>`_
> 2.7 or
> later.
>
> LLVM testing infrastructure organization
>
> Modified: llvm/trunk/utils/lit/tests/test-output.py
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/test-
> output.py?rev=224129&r1=224128&r2=224129&view=diff
> ==========================================================================
> ====
> --- llvm/trunk/utils/lit/tests/test-output.py (original)
> +++ llvm/trunk/utils/lit/tests/test-output.py Fri Dec 12 09:29:31 2014
> @@ -1,5 +1,3 @@
> -# XFAIL: python2.5
> -
> # RUN: %{lit} -j 1 -v %{inputs}/test-data --output %t.results.out >
> %t.out
> # RUN: FileCheck < %t.results.out %s
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list