diff options
| author | Emil Velikov <[email protected]> | 2018-08-16 13:59:38 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-10-31 19:15:50 +0000 |
| commit | 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a (patch) | |
| tree | 272f346932d8d545e79213feeab07d610fa3dfbd /src/intel | |
| parent | 6d7d3dbda531b0bc692ffb479d65527b2138dbf3 (diff) | |
configure: allow building with python3
Pretty much all of the scripts are python2+3 compatible.
Check and allow using python3, while adjusting the PYTHON2 refs.
Note:
- python3.4 is used as it's the earliest supported version
- python2 chosen prior to python3
v2: use python2 by default
Cc: Ilia Mirkin <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
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 95764b82da7..5a2518d8d72 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)$(PYTHON2) $(PYTHON_FLAGS) +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) lib_LTLIBRARIES = check_LTLIBRARIES = diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.am index 46711fe71b7..cd7e6882fb9 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) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false) + $(AM_V_GEN) $(PYTHON) $(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 d5112633b5c..49108bbf946 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)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \ + $(AM_V_GEN)$(PYTHON) $(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)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \ + $(AM_V_GEN)$(PYTHON) $(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)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \ + $(AM_V_GEN)$(PYTHON) $(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)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ + $(AM_V_GEN)$(PYTHON) $(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)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \ --lib-path="${libdir}" --out $@ if HAVE_INTEL_VULKAN |