From 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 16 Aug 2018 13:59:38 +0100 Subject: 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 Signed-off-by: Emil Velikov Acked-by: Eric Engestrom --- src/amd/vulkan/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/amd/vulkan') diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am index e28f032cbee..2522171dacf 100644 --- a/src/amd/vulkan/Makefile.am +++ b/src/amd/vulkan/Makefile.am @@ -140,7 +140,7 @@ vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml) $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_entrypoints_gen.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_entrypoints_gen.py \ --xml $(vulkan_api_xml) \ --outdir $(builddir) radv_entrypoints.h: radv_entrypoints.c @@ -148,7 +148,7 @@ radv_entrypoints.h: radv_entrypoints.c radv_extensions.c: radv_extensions.py \ $(vulkan_api_xml) $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_extensions.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_extensions.py \ --xml $(vulkan_api_xml) \ --out-c radv_extensions.c \ --out-h radv_extensions.h @@ -157,7 +157,7 @@ radv_extensions.h: radv_extensions.c vk_format_table.c: vk_format_table.py \ vk_format_parse.py \ vk_format_layout.csv - $(PYTHON2) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@ + $(PYTHON) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@ BUILT_SOURCES = $(VULKAN_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@host_cpu@.json @@ -190,11 +190,11 @@ icdconf_DATA = radeon_icd.@host_cpu@.json noinst_DATA = dev_icd.json dev_icd.json : radv_extensions.py radv_icd.py - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \ --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@ radeon_icd.@host_cpu@.json : radv_extensions.py radv_icd.py - $(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \ --lib-path="${libdir}" --out $@ include $(top_srcdir)/install-lib-links.mk -- cgit v1.2.3