Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-10-02 Thread Dylan Baker 
I haven't had a chance to do that yet. I'll see if I can find some time this
week.

Quoting Emil Velikov (2018-10-02 08:02:12)
> Hi Dylan,
> 
> On Mon, 3 Sep 2018 at 14:57, Emil Velikov  wrote:
> >
> > On 24 August 2018 at 19:51, Dylan Baker  wrote:
> > > Can we just change the script to write a file instead of sending it's 
> > > output
> > > through the shell? That should fix any encoding problems since the shell 
> > > wont
> > > touch it and the LANG settings (no matter what they are) shouldn't matter.
> > >
> > Seems like I forgot to reply to this. Yes, please - that would be
> > highly preferred.
> >
> Did you get the chance to do this?
> 
> Thanks
> Emil


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-10-02 Thread Emil Velikov 
Hi Dylan,

On Mon, 3 Sep 2018 at 14:57, Emil Velikov  wrote:
>
> On 24 August 2018 at 19:51, Dylan Baker  wrote:
> > Can we just change the script to write a file instead of sending it's output
> > through the shell? That should fix any encoding problems since the shell 
> > wont
> > touch it and the LANG settings (no matter what they are) shouldn't matter.
> >
> Seems like I forgot to reply to this. Yes, please - that would be
> highly preferred.
>
Did you get the chance to do this?

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-09-03 Thread Emil Velikov 
On 24 August 2018 at 19:51, Dylan Baker  wrote:
> Can we just change the script to write a file instead of sending it's output
> through the shell? That should fix any encoding problems since the shell wont
> touch it and the LANG settings (no matter what they are) shouldn't matter.
>
Seems like I forgot to reply to this. Yes, please - that would be
highly preferred.

-Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-24 Thread Dylan Baker 
Can we just change the script to write a file instead of sending it's output
through the shell? That should fix any encoding problems since the shell wont
touch it and the LANG settings (no matter what they are) shouldn't matter.

Dylan

Quoting Mathieu Bridon (2018-08-24 07:58:21)
> Hi,
> 
> On Thu, 2018-08-23 at 23:23 -0400, Ilia Mirkin wrote:
> > 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.
> 
> In general though, Python 3 works very badly with LANG=C. Upstream
> Python recommends just not using LANG=C at all, and instead using a
> UTF8 locale, like C.UTF-8 instead.
> 
> In fact, starting with 3.7, Python will emit a big warning when it is
> run on a non-UTF8 locale, and try to fallback to C.UTF-8 if it can.
> 
> There might be something to fix in this case (I haven't had time to
> look at it yet), but I'd still advise you try and use a UTF8 locale
> when running Python scripts in the future, if at all possible.
> 
> 
> -- 
> Mathieu
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-24 Thread Mathieu Bridon 
Hi,

On Thu, 2018-08-23 at 23:23 -0400, Ilia Mirkin wrote:
> 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.

In general though, Python 3 works very badly with LANG=C. Upstream
Python recommends just not using LANG=C at all, and instead using a
UTF8 locale, like C.UTF-8 instead.

In fact, starting with 3.7, Python will emit a big warning when it is
run on a non-UTF8 locale, and try to fallback to C.UTF-8 if it can.

There might be something to fix in this case (I haven't had time to
look at it yet), but I'd still advise you try and use a UTF8 locale
when running Python scripts in the future, if at all possible.


-- 
Mathieu

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-24 Thread Dylan Baker 
Quoting Emil Velikov (2018-08-24 02:34:04)
> On Fri, 24 Aug 2018 at 04:23, Ilia Mirkin  wrote:
> >
> > 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?
> >
> Sure will revert in a moment. The concerning part is why meson "succeeds".
> 
> Having a look if lacks the $(LANGS) argument when invoking gen_xmlpool.py.
> And the .mo and .po files (on which LANGS is based on) are missing all
> together in meson.
> 
> Mathieu, Dylan can you look into this?
> Once the meson build is updated, Ilia's concerns will become more obvious.
> 
> Thanks
> Emil

This (and my dog waking me up at 5 am so she could potty) got me looking into
the translations again. I've sent a series that addresses the lack of
translation handling in meson.

Dylan


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-24 Thread Dylan Baker 
Quoting Emil Velikov (2018-08-24 02:34:04)
> On Fri, 24 Aug 2018 at 04:23, Ilia Mirkin  wrote:
> >
> > 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?
> >
> Sure will revert in a moment. The concerning part is why meson "succeeds".
> 
> Having a look if lacks the $(LANGS) argument when invoking gen_xmlpool.py.
> And the .mo and .po files (on which LANGS is based on) are missing all
> together in meson.
> 
> Mathieu, Dylan can you look into this?
> Once the meson build is updated, Ilia's concerns will become more obvious.

Meson has built-ins for handling gettext, but I haven't wired them up yet. They
work somewhat differently than the way mesa does (they're a separate build step
you run before building the 'all' target). If you're building from a release
tarball meson will pick up the ones generated by autotools for the tarball.

Dylan


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-24 Thread Emil Velikov 
On Fri, 24 Aug 2018 at 04:23, Ilia Mirkin  wrote:
>
> 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?
>
Sure will revert in a moment. The concerning part is why meson "succeeds".

Having a look if lacks the $(LANGS) argument when invoking gen_xmlpool.py.
And the .mo and .po files (on which LANGS is based on) are missing all
together in meson.

Mathieu, Dylan can you look into this?
Once the meson build is updated, Ilia's concerns will become more obvious.

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-23 Thread Ilia Mirkin 
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  wrote:
> From: Emil Velikov 
>
> 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 
> ---
>  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:

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-23 Thread Emil Velikov 
On Thu, 23 Aug 2018 at 15:59, Eric Engestrom  wrote:
>
> On Thursday, 2018-08-23 15:34:29 +0100, Emil Velikov wrote:
> > From: Emil Velikov 
> >
> > 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 
>
> Not fully double-checked, but +1 on the idea and a skim through didn't
> notice anything.
>
> Acked-by: Eric Engestrom 
>
Thanks. A quick sanity check with git grep -w PYTHON2.
And an extra on top is a Travis run [1]

I'll push these in a moment.
-Emil

[1] https://travis-ci.org/evelikov/Mesa/builds/419665154
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-23 Thread Eric Engestrom 
On Thursday, 2018-08-23 15:34:29 +0100, Emil Velikov wrote:
> From: Emil Velikov 
> 
> 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 

Not fully double-checked, but +1 on the idea and a skim through didn't
notice anything.

Acked-by: Eric Engestrom 

> ---
>  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)
>

[Mesa-dev] [PATCH 2/3] configure: allow building with python3

2018-08-23 Thread Emil Velikov 
From: Emil Velikov 

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 
---
 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)