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/mesa | |
| 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/mesa')
| -rw-r--r-- | src/mesa/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index d7daa995c5c..195e4400355 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -73,7 +73,7 @@ CLEANFILES = \ $(BUILT_SOURCES) \ program/program_parse.tab.h -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \ main/get_hash_generator.py diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index b6fff47abe9..889d4c68a2b 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -115,7 +115,7 @@ EXTRA_DIST = \ meson.build brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES) - $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \ + $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \ --code=$(builddir)/brw_oa_metrics.c \ --header=$(builddir)/brw_oa_metrics.h \ $(i965_oa_xml_FILES:%=$(srcdir)/%) |