diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2016-05-31 13:31:44 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2016-05-31 14:45:40 -0700 |
| commit | 7f75f89e27c0dc1be8f017ee2456df1479840cb3 (patch) | |
| tree | 6e707fbf2fb16387334a014b7d4de667934ec762 | |
| parent | d4cd065fb6f3845b65c326eab752862f9d55f1ac (diff) | |
Don't use python 3submit/python2-for-intel
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@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
cc: 12.0 <mesa-stable@lists.freedesktop.org>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/intel/genxml/Makefile.am | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 173d6df3a4..33d1fefc54 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 c393ebe316..d6c1c5b512 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) |