This breaks the build for me. It selects python3 instead of python2,
and gen_xmlpool.py bails out when trying to print \xf3 to stdout with
a LANG=C locale. Revert until scripts are fixed and try again?
On Thu, Aug 23, 2018 at 10:34 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> 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
> - python3 is chosen prior to python2
>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> configure.ac | 8 +++-----
> m4/ax_check_python_mako_module.m4 | 2 +-
> src/Makefile.am | 2 +-
> src/amd/Makefile.common.am | 2 +-
> src/amd/vulkan/Makefile.am | 10 +++++-----
> src/broadcom/Makefile.am | 2 +-
> src/compiler/Makefile.am | 2 +-
> src/compiler/Makefile.glsl.am | 2 +-
> src/compiler/glsl/glcpp/tests/glcpp-test.sh | 2 +-
> src/compiler/glsl/tests/optimization-test.sh | 2 +-
> src/compiler/glsl/tests/warnings-test.sh | 2 +-
> src/egl/Makefile.am | 2 +-
> src/gallium/auxiliary/Makefile.am | 2 +-
> src/gallium/drivers/freedreno/Makefile.am | 2 +-
> src/gallium/drivers/r600/Makefile.am | 2 +-
> src/gallium/drivers/radeonsi/Makefile.am | 2 +-
> src/gallium/drivers/swr/Makefile.am | 2 +-
> src/intel/Makefile.am | 2 +-
> src/intel/Makefile.compiler.am | 2 +-
> src/intel/Makefile.vulkan.am | 10 +++++-----
> src/mapi/Makefile.am | 2 +-
> src/mapi/glapi/gen/Makefile.am | 2 +-
> src/mesa/Makefile.am | 2 +-
> src/mesa/drivers/dri/i965/Makefile.am | 2 +-
> src/util/Makefile.am | 2 +-
> src/util/xmlpool/Makefile.am | 2 +-
> src/vulkan/Makefile.am | 2 +-
> 27 files changed, 37 insertions(+), 39 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index f8bb131cb63..8dea87fa6a8 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -125,9 +125,7 @@ AC_PROG_GREP
> AC_PROG_NM
> AM_PROG_AS
> AX_CHECK_GNU_MAKE
> -AM_PATH_PYTHON([2.7],, [:])
> -PYTHON2=$PYTHON
> -AC_SUBST([PYTHON2])
> +AM_PATH_PYTHON([3.4],, [AM_PATH_PYTHON([2.7],, [:])])
>
> AC_PROG_SED
> AC_PROG_MKDIR_P
> @@ -160,7 +158,7 @@ fi
>
> AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
>
> -if test "$PYTHON2" = ":"; then
> +if test "$PYTHON" = ":"; then
> if test ! -f "$srcdir/src/util/format_srgb.c"; then
> AC_MSG_ERROR([Python not found - unable to generate sources])
> fi
> @@ -3348,7 +3346,7 @@ if test "x$enable_llvm" = xyes; then
> echo " LLVM_LDFLAGS: $LLVM_LDFLAGS"
> echo ""
> fi
> -echo " PYTHON2: $PYTHON2"
> +echo " PYTHON: $PYTHON"
>
> echo ""
> echo " Run '${MAKE-make}' to build Mesa"
> diff --git a/m4/ax_check_python_mako_module.m4
> b/m4/ax_check_python_mako_module.m4
> index 1d293d821c3..d6484e722fd 100644
> --- a/m4/ax_check_python_mako_module.m4
> +++ b/m4/ax_check_python_mako_module.m4
> @@ -52,7 +52,7 @@ else:
> ver_req = distutils.version.LooseVersion('$1')
> ver_act = distutils.version.LooseVersion(mako.__version__)
> sys.exit(int(ver_req > ver_act))
> - " | $PYTHON2 -
> + " | $PYTHON -
>
> if test $? -ne 0 ; then
> AC_MSG_RESULT(no)
> diff --git a/src/Makefile.am b/src/Makefile.am
> index c4fcd8a9248..c91e63efa13 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -22,7 +22,7 @@
> .PHONY: git_sha1.h
> git_sha1.h:
> @echo "updating $@"
> - @$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py --output $@
> + @$(PYTHON) $(top_srcdir)/bin/git_sha1_gen.py --output $@
>
> BUILT_SOURCES = git_sha1.h
> CLEANFILES = $(BUILT_SOURCES)
> diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
> index d62e9d41cf4..453d23c3ac9 100644
> --- a/src/amd/Makefile.common.am
> +++ b/src/amd/Makefile.common.am
> @@ -66,6 +66,6 @@ common_libamd_common_la_LIBADD = $(LIBELF_LIBS)
>
> common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h
> $(srcdir)/common/gfx9d.h
> $(AM_V_at)$(MKDIR_P) $(@D)
> - $(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py
> $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
> + $(AM_V_GEN) $(PYTHON) $(srcdir)/common/sid_tables.py
> $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
>
> BUILT_SOURCES = $(AMD_GENERATED_FILES)
> 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
> diff --git a/src/broadcom/Makefile.am b/src/broadcom/Makefile.am
> index 4faa7721544..4cd75bbcc06 100644
> --- a/src/broadcom/Makefile.am
> +++ b/src/broadcom/Makefile.am
> @@ -56,7 +56,7 @@ EXTRA_DIST = \
> qpu/meson.build
>
> MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
>
> include Makefile.genxml.am
> include Makefile.cle.am
> diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
> index 73435a3b5d6..05cdb1446c0 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)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
>
> include Makefile.spirv.am
>
> diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
> index 02a7f432150..a323f7b05bc 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 PYTHON2=$(PYTHON2); \
> + export PYTHON=$(PYTHON); \
> 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 b8397ec8902..666a617bfb1 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
>
> -$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py
> $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows
> --oldmac --bizarro
> +$PYTHON $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 410ed262ef0..751529a5159 100755
> --- a/src/compiler/glsl/tests/optimization-test.sh
> +++ b/src/compiler/glsl/tests/optimization-test.sh
> @@ -1,3 +1,3 @@
> #!/bin/sh
>
> -$PYTHON2 $srcdir/glsl/tests/optimization_test.py --test-runner
> $abs_builddir/glsl/glsl_test
> +$PYTHON $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 09b6bb2fc98..12f68c2300f 100755
> --- a/src/compiler/glsl/tests/warnings-test.sh
> +++ b/src/compiler/glsl/tests/warnings-test.sh
> @@ -1,3 +1,3 @@
> #!/bin/sh
>
> -$PYTHON2 $srcdir/glsl/tests/warnings_test.py --glsl-compiler
> $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/
> +$PYTHON $srcdir/glsl/tests/warnings_test.py --glsl-compiler
> $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/
> diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
> index 485f145cece..1ff4fe23da7 100644
> --- a/src/egl/Makefile.am
> +++ b/src/egl/Makefile.am
> @@ -142,7 +142,7 @@ GLVND_GEN_DEPS = generate/gen_egl_dispatch.py \
> generate/egl.xml generate/eglFunctionList.py generate/genCommon.py \
> generate/egl_other.xml
>
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
> g_egldispatchstubs.c: $(GLVND_GEN_DEPS)
> $(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py
> source \
> $(top_srcdir)/src/egl/generate/eglFunctionList.py \
> diff --git a/src/gallium/auxiliary/Makefile.am
> b/src/gallium/auxiliary/Makefile.am
> index 4bfa7648389..d7d803a961c 100644
> --- a/src/gallium/auxiliary/Makefile.am
> +++ b/src/gallium/auxiliary/Makefile.am
> @@ -54,7 +54,7 @@ libgallium_la_SOURCES += \
> endif
>
> MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
>
> indices/u_indices_gen.c: indices/u_indices_gen.py
> $(MKDIR_GEN)
> diff --git a/src/gallium/drivers/freedreno/Makefile.am
> b/src/gallium/drivers/freedreno/Makefile.am
> index c19b776892c..67095de6e0f 100644
> --- a/src/gallium/drivers/freedreno/Makefile.am
> +++ b/src/gallium/drivers/freedreno/Makefile.am
> @@ -12,7 +12,7 @@ AM_CFLAGS = \
> MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py
> $(top_srcdir)/src/compiler/nir/nir_algebraic.py
> $(MKDIR_GEN)
> - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py
> -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
> + $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py
> -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
>
> noinst_LTLIBRARIES = libfreedreno.la
>
> diff --git a/src/gallium/drivers/r600/Makefile.am
> b/src/gallium/drivers/r600/Makefile.am
> index 1138de985dd..c5b41cce26e 100644
> --- a/src/gallium/drivers/r600/Makefile.am
> +++ b/src/gallium/drivers/r600/Makefile.am
> @@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
>
> egd_tables.h: $(srcdir)/egd_tables.py $(srcdir)/evergreend.h
> $(AM_V_at)$(MKDIR_P) $(@D)
> - $(AM_V_GEN) $(PYTHON2) $(srcdir)/egd_tables.py $(srcdir)/evergreend.h
> > $@
> + $(AM_V_GEN) $(PYTHON) $(srcdir)/egd_tables.py $(srcdir)/evergreend.h
> > $@
>
> BUILT_SOURCES = $(R600_GENERATED_FILES)
> AM_CFLAGS = \
> diff --git a/src/gallium/drivers/radeonsi/Makefile.am
> b/src/gallium/drivers/radeonsi/Makefile.am
> index 62b877d4ea4..317ae7ea19f 100644
> --- a/src/gallium/drivers/radeonsi/Makefile.am
> +++ b/src/gallium/drivers/radeonsi/Makefile.am
> @@ -48,7 +48,7 @@ GEN_DRIINFO_INPUTS = \
> $(top_srcdir)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \
> $(srcdir)/driinfo_radeonsi.h
>
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
> MERGE_DRIINFO = $(top_srcdir)/src/util/merge_driinfo.py
>
> si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
> diff --git a/src/gallium/drivers/swr/Makefile.am
> b/src/gallium/drivers/swr/Makefile.am
> index d20a6bdbed3..3390ef6b096 100644
> --- a/src/gallium/drivers/swr/Makefile.am
> +++ b/src/gallium/drivers/swr/Makefile.am
> @@ -98,7 +98,7 @@ BUILT_SOURCES = \
> rasterizer/core/backends/gen_rasterizer.hpp
>
> MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
> gen_swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py
> rasterizer/codegen/templates/gen_llvm.hpp swr_context.h
> $(PYTHON_GEN) \
> $(srcdir)/rasterizer/codegen/gen_llvm_types.py \
> 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 9555d98095b..46f22047e36 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.@host_cpu@.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="${libdir}" --out $@
>
> if HAVE_INTEL_VULKAN
> diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
> index 3da1a193d28..97ebdeb1d7f 100644
> --- a/src/mapi/Makefile.am
> +++ b/src/mapi/Makefile.am
> @@ -59,7 +59,7 @@ AM_CPPFLAGS =
> \
> include Makefile.sources
>
> MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
>
> glapi_gen_mapi_deps := \
> mapi_abi.py \
> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
> index 93acabd968b..7a80f266260 100644
> --- a/src/mapi/glapi/gen/Makefile.am
> +++ b/src/mapi/glapi/gen/Makefile.am
> @@ -233,7 +233,7 @@ COMMON = $(API_XML) \
>
> COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
>
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
>
> ######################################################################
>
> diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
> index 195e4400355..d7daa995c5c 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)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(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 889d4c68a2b..b6fff47abe9 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)
> - $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
> + $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
> --code=$(builddir)/brw_oa_metrics.c \
> --header=$(builddir)/brw_oa_metrics.h \
> $(i965_oa_xml_FILES:%=$(srcdir)/%)
> diff --git a/src/util/Makefile.am b/src/util/Makefile.am
> index efb94caff71..7dedaab9fc7 100644
> --- a/src/util/Makefile.am
> +++ b/src/util/Makefile.am
> @@ -93,7 +93,7 @@ EXTRA_DIST = \
> sha1/README \
> meson.build
>
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
>
> format_srgb.c: format_srgb.py
> $(PYTHON_GEN) $(srcdir)/format_srgb.py > $@
> diff --git a/src/util/xmlpool/Makefile.am b/src/util/xmlpool/Makefile.am
> index 0ef7a5462a1..f5142768aa3 100644
> --- a/src/util/xmlpool/Makefile.am
> +++ b/src/util/xmlpool/Makefile.am
> @@ -70,7 +70,7 @@ CLEANFILES = \
> # Default target options.h
> LOCALEDIR := .
> options.h: t_options.h $(MOS)
> - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py
> $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h
> + $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py
> $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h
>
> # Update .mo files from the corresponding .po files.
> %/LC_MESSAGES/options.mo: %.po
> diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
> index db3831229e9..dc7e32aaa68 100644
> --- a/src/vulkan/Makefile.am
> +++ b/src/vulkan/Makefile.am
> @@ -6,7 +6,7 @@ vulkan_includedir = $(includedir)/vulkan
> vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
>
> MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
>
> EXTRA_DIST = \
> util/gen_enum_to_str.py \
> --
> 2.18.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
