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 /src/compiler | |
| 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 'src/compiler')
| -rw-r--r-- | src/compiler/Makefile.am | 2 | ||||
| -rw-r--r-- | src/compiler/Makefile.glsl.am | 2 | ||||
| -rwxr-xr-x | src/compiler/glsl/glcpp/tests/glcpp-test.sh | 2 | ||||
| -rwxr-xr-x | src/compiler/glsl/tests/optimization-test.sh | 2 | ||||
| -rwxr-xr-x | src/compiler/glsl/tests/warnings-test.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 05cdb1446c0..73435a3b5d6 100644 --- a/src/compiler/Makefile.am +++ b/src/compiler/Makefile.am @@ -68,7 +68,7 @@ EXTRA_DIST = \ meson.build MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) include Makefile.spirv.am diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index a323f7b05bc..02a7f432150 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -41,7 +41,7 @@ TESTS += glsl/glcpp/tests/glcpp-test.sh \ TESTS_ENVIRONMENT= \ export abs_builddir=$(abs_builddir); \ - export PYTHON=$(PYTHON); \ + export PYTHON2=$(PYTHON2); \ export PYTHON_FLAGS=$(PYTHON_FLAGS); check_PROGRAMS += \ diff --git a/src/compiler/glsl/glcpp/tests/glcpp-test.sh b/src/compiler/glsl/glcpp/tests/glcpp-test.sh index 666a617bfb1..b8397ec8902 100755 --- a/src/compiler/glsl/glcpp/tests/glcpp-test.sh +++ b/src/compiler/glsl/glcpp/tests/glcpp-test.sh @@ -13,4 +13,4 @@ if [ -z "$srcdir" -o -z "$abs_builddir" ]; then abs_builddir=`pwd`/../../../ fi -$PYTHON $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro +$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro diff --git a/src/compiler/glsl/tests/optimization-test.sh b/src/compiler/glsl/tests/optimization-test.sh index 751529a5159..410ed262ef0 100755 --- a/src/compiler/glsl/tests/optimization-test.sh +++ b/src/compiler/glsl/tests/optimization-test.sh @@ -1,3 +1,3 @@ #!/bin/sh -$PYTHON $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test +$PYTHON2 $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test diff --git a/src/compiler/glsl/tests/warnings-test.sh b/src/compiler/glsl/tests/warnings-test.sh index 12f68c2300f..09b6bb2fc98 100755 --- a/src/compiler/glsl/tests/warnings-test.sh +++ b/src/compiler/glsl/tests/warnings-test.sh @@ -1,3 +1,3 @@ #!/bin/sh -$PYTHON $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/ +$PYTHON2 $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/ |