<div dir="ltr"><div>Other than the two or three fairly trivial comments, these all seem good. </div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div> Please make sure you CC 12.0 stable. </div>--Jason </div><div class="gmail_extra"> <div class="gmail_quote">On Tue, May 31, 2016 at 2:30 PM, Dylan Baker <<a href="mailto:dylan@pnwbakers.com" target="_blank">dylan@pnwbakers.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">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 <<a href="mailto:dylanx.c.baker@intel.com">dylanx.c.baker@intel.com</a>> --- <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 8 -------- src/intel/genxml/Makefile.am | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> index 173d6df..33d1fef 100644 --- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> +++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> @@ -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 <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>