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/intel | |
| 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/intel')
| -rw-r--r-- | src/intel/Makefile.am | 2 | ||||
| -rw-r--r-- | src/intel/Makefile.compiler.am | 2 | ||||
| -rw-r--r-- | src/intel/Makefile.vulkan.am | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am index 5a2518d8d72..95764b82da7 100644 --- a/src/intel/Makefile.am +++ b/src/intel/Makefile.am @@ -50,7 +50,7 @@ AM_CXXFLAGS = \ $(VISIBILITY_CXXFLAGS) MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) lib_LTLIBRARIES = check_LTLIBRARIES = diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.am index cd7e6882fb9..46711fe71b7 100644 --- a/src/intel/Makefile.compiler.am +++ b/src/intel/Makefile.compiler.am @@ -35,7 +35,7 @@ BUILT_SOURCES += $(COMPILER_GENERATED_FILES) compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py \ $(top_srcdir)/src/compiler/nir/nir_algebraic.py $(MKDIR_GEN) - $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false) + $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false) EXTRA_DIST += \ compiler/brw_nir_trig_workarounds.py diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am index 46f22047e36..9555d98095b 100644 --- a/src/intel/Makefile.vulkan.am +++ b/src/intel/Makefile.vulkan.am @@ -28,7 +28,7 @@ vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \ vulkan/anv_extensions.py \ $(vulkan_api_xml) $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_entrypoints_gen.py \ + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \ --xml $(vulkan_api_xml) \ --outdir $(builddir)/vulkan vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c @@ -37,7 +37,7 @@ vulkan/anv_extensions.c: vulkan/anv_extensions_gen.py \ vulkan/anv_extensions.py \ $(vulkan_api_xml) $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \ + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \ --xml $(vulkan_api_xml) \ --out-c $@ @@ -45,7 +45,7 @@ vulkan/anv_extensions.h: vulkan/anv_extensions_gen.py \ vulkan/anv_extensions.py \ $(vulkan_api_xml) $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \ + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \ --xml $(vulkan_api_xml) \ --out-h $@ @@ -65,12 +65,12 @@ EXTRA_DIST += \ vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \ + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@ vulkan/intel_icd.@[email protected] : vulkan/anv_extensions.py vulkan/anv_icd.py $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \ + $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ --lib-path="${libdir}" --out $@ if HAVE_INTEL_VULKAN |