fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 20:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't use python 3

Browse source 
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>
This commit is contained in:
Dylan Baker 2016-05-31 13:31:44 -07:00 • committed by Jason Ekstrand
parent ab31817fed
commit 604010a7ed
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -99,7 +99,6 @@ AM_PROG_CC_C_O
AM_PROG_AS AM_PROG_AS
AX_CHECK_GNU_MAKE AX_CHECK_GNU_MAKE
AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python]) AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
AC_CHECK_PROGS([PYTHON3], [python3.5 python3.4 python3])
AC_PROG_SED AC_PROG_SED
AC_PROG_MKDIR_P AC_PROG_MKDIR_P
@ -142,12 +141,6 @@ else
fi fi
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 AC_PROG_INSTALL
dnl We need a POSIX shell for parts of the build. Assume we have one 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 "" echo ""
fi fi
echo " PYTHON2: $PYTHON2" echo " PYTHON2: $PYTHON2"
echo " PYTHON3: $PYTHON3"
echo "" echo ""
echo " Run '${MAKE-make}' to build Mesa" echo " Run '${MAKE-make}' to build Mesa"

4
src/intel/genxml/Makefile.am
View file

@ -23,14 +23,14 @@ include Makefile.sources
BUILT_SOURCES = $(GENXML_GENERATED_FILES) 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 SUFFIXES = _pack.h .xml
$(BUILT_SOURCES): gen_pack_header.py $(BUILT_SOURCES): gen_pack_header.py
.xml_pack.h: .xml_pack.h:
$(PYTHON3_GEN) $(srcdir)/gen_pack_header.py $< > $@ $(PYTHON_GEN) $(srcdir)/gen_pack_header.py $< > $@
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)