[Mesa-stable] [Mesa-dev] [PATCH 7/7] Don't use python 3

[Jason Ekstrand]

Other than the two or three fairly trivial comments, these all seem good.

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

Please make sure you CC 12.0 stable.
--Jason

On Tue, May 31, 2016 at 2:30 PM, Dylan Baker <dylan at pnwbakers.com> wrote:

> Now there are not files that require python 3, so for now just remove
> the python 3 dependency and use python 2. I think the right plan is to
> just get all of the python ready for python 3, and then use whatever
> python is available.
>
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  configure.ac                 | 8 --------
>  src/intel/genxml/Makefile.am | 4 ++--
>  2 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 173d6df..33d1fef 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -99,7 +99,6 @@ AM_PROG_CC_C_O
>  AM_PROG_AS
>  AX_CHECK_GNU_MAKE
>  AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
> -AC_CHECK_PROGS([PYTHON3], [python3.5 python3.4 python3])
>  AC_PROG_SED
>  AC_PROG_MKDIR_P
>
> @@ -142,12 +141,6 @@ else
>      fi
>  fi
>
> -if test -z "$PYTHON3"; then
> -    if test ! -f "$srcdir/src/intel/genxml/gen9_pack.h"; then
> -        AC_MSG_ERROR([Python3 not found - unable to generate sources])
> -    fi
> -fi
> -
>  AC_PROG_INSTALL
>
>  dnl We need a POSIX shell for parts of the build. Assume we have one
> @@ -2874,7 +2867,6 @@ if test "x$MESA_LLVM" = x1; then
>      echo ""
>  fi
>  echo "        PYTHON2:         $PYTHON2"
> -echo "        PYTHON3:         $PYTHON3"
>
>  echo ""
>  echo "        Run '${MAKE-make}' to build Mesa"
> diff --git a/src/intel/genxml/Makefile.am b/src/intel/genxml/Makefile.am
> index c393ebe..d6c1c5b 100644
> --- a/src/intel/genxml/Makefile.am
> +++ b/src/intel/genxml/Makefile.am
> @@ -23,14 +23,14 @@ include Makefile.sources
>
>  BUILT_SOURCES = $(GENXML_GENERATED_FILES)
>
> -PYTHON3_GEN = $(AM_V_GEN)$(PYTHON3) $(PYTHON_FLAGS)
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
>
>  SUFFIXES = _pack.h .xml
>
>  $(BUILT_SOURCES): gen_pack_header.py
>
>  .xml_pack.h:
> -       $(PYTHON3_GEN) $(srcdir)/gen_pack_header.py $< > $@
> +       $(PYTHON_GEN) $(srcdir)/gen_pack_header.py $< > $@
>
>  CLEANFILES = $(BUILT_SOURCES)
>
> --
> 2.8.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-stable/attachments/20160531/c33dcc50/attachment.html>