diff options
| author | Emil Velikov <[email protected]> | 2018-08-24 11:14:15 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-08-24 11:14:15 +0100 |
| commit | cff80b6c153661ed40a207815a3d3a132daae656 (patch) | |
| tree | 9942a8361e0d4d7662af8e782c21388a725880b1 /configure.ac | |
| parent | 7a4d2d1fdf3fd6dd79cda971b5b3669fc7fbc729 (diff) | |
Revert "configure: allow building with python3"
This reverts commit ae7898dfdbe5c8dab7d11c71862353f1ae43feb0.
Turns out the python scripts are _not_ fully python 3 compatible.
As Ilia reported using get_xmlpool.py with LANG=C produces some weird
output - see the link for details.
Even though the issue was spotted with the autoconf build, it exposes a
genuine problem with the script (and lack of lang handling of the meson
build.)
https://lists.freedesktop.org/archives/mesa-dev/2018-August/203508.html
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8dea87fa6a8..f8bb131cb63 100644 --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,9 @@ AC_PROG_GREP AC_PROG_NM AM_PROG_AS AX_CHECK_GNU_MAKE -AM_PATH_PYTHON([3.4],, [AM_PATH_PYTHON([2.7],, [:])]) +AM_PATH_PYTHON([2.7],, [:]) +PYTHON2=$PYTHON +AC_SUBST([PYTHON2]) AC_PROG_SED AC_PROG_MKDIR_P @@ -158,7 +160,7 @@ fi AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED) -if test "$PYTHON" = ":"; then +if test "$PYTHON2" = ":"; then if test ! -f "$srcdir/src/util/format_srgb.c"; then AC_MSG_ERROR([Python not found - unable to generate sources]) fi @@ -3346,7 +3348,7 @@ if test "x$enable_llvm" = xyes; then echo " LLVM_LDFLAGS: $LLVM_LDFLAGS" echo "" fi -echo " PYTHON: $PYTHON" +echo " PYTHON2: $PYTHON2" echo "" echo " Run '${MAKE-make}' to build Mesa" |