From c55925ded5cfd9eb051a858f68aafc8474bd6038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Sztern?= <sztern.kevin@gmail.com>
Date: Sat, 5 Jul 2014 13:14:54 +0200
Subject: [PATCH] Force execution of python2 during build

On bleeding edge systems, `python` symlinks to `python3`, causing errors
in the execution of various python scripts in the building phase.
This patch checks for the presence of a `python2` binary, and uses it
explicitely instead of `python` if found.
---
 bootstrap             | 7 ++++++-
 configure.ac          | 4 ++++
 doc/Makefile.am       | 2 +-
 src/inst/Makefile.am  | 9 +++++----
 src/parse/Makefile.am | 4 ++--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/bootstrap b/bootstrap
index ee0e3d2..9b97701 100755
--- a/bootstrap
+++ b/bootstrap
@@ -241,7 +241,12 @@ echo "$0: Creating lib/Makefile.am"
 echo "$0: Generating src/inst/nodes.mk"
 here=`pwd`
 cd src/inst
-PYTHONPATH="../../dev/:$$PYTHONPATH" ./nodes.mk.gen.py < ../../dev/nolimips.xml > nodes.mk
+if command -v python2 > /dev/null 2>&1 ; then
+    PYTHON=python2
+else
+    PYTHON=python
+fi
+PYTHONPATH="../../dev/:$$PYTHONPATH" $PYTHON ./nodes.mk.gen.py < ../../dev/nolimips.xml > nodes.mk
 cd $here
 
 find tests -name '*.ref' -exec touch '{}' ';'
diff --git a/configure.ac b/configure.ac
index 1e3f366..fa77e5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,10 @@ AC_CHECK_READLINE
 # Check presence of `isblank'.
 AC_CHECK_FUNCS([isblank])
 
+# Check for presence of python2, used in Makefile conditionals
+PYTHON2=$(command -v python2 || command -v python)
+AC_SUBST([PYTHON2])
+
 
 ## Development environment -------------
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d9595b4..bc0898d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = $(srcdir)/inst-set.texi.gen.py
 inst-set.texi.stamp: $(srcdir)/inst-set.texi.gen.py $(top_srcdir)/dev/nolimips.xml
 	@rm -rf $@.tmp
 	@touch $@.tmp
-	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/inst-set.texi.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
+	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" @PYTHON2@ $(srcdir)/inst-set.texi.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
 	@mv -f $@.tmp $@
 $(FROM_INST_SET_TEXI_GEN_PY): inst-set.texi.stamp
 
diff --git a/src/inst/Makefile.am b/src/inst/Makefile.am
index a1f826f..36b9906 100644
--- a/src/inst/Makefile.am
+++ b/src/inst/Makefile.am
@@ -5,19 +5,20 @@ BUILT_SOURCES =								\
 	program_builder.hh program_builder.hh.stamp			\
 	program_solver.hh program_solver.cc program_solver.stamp
 
+
 # This code comes from "Handling Tools that Produce Many Outputs",
 # from the Automake documentation.
 
 EXTRA_DIST = $(srcdir)/nodes.mk.gen.py
 nodes.mk: $(srcdir)/nodes.mk.gen.py $(top_srcdir)/dev/nolimips.xml
-	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/nodes.mk.gen.py < $(top_srcdir)/dev/nolimips.xml >$@.tmp
+	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" @PYTHON2@ $(srcdir)/nodes.mk.gen.py < $(top_srcdir)/dev/nolimips.xml >$@.tmp
 	mv -f $@.tmp $@
 
 EXTRA_DIST += $(srcdir)/nodes.gen.py
 nodes.stamp: $(srcdir)/nodes.gen.py $(top_srcdir)/dev/nolimips.xml
 	@rm -rf $@.tmp
 	@touch $@.tmp
-	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/nodes.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
+	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" @PYTHON2@ $(srcdir)/nodes.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
 	@mv -f $@.tmp $@
 $(FROM_NODES_GEN_PY): nodes.stamp
 
@@ -25,7 +26,7 @@ EXTRA_DIST += $(srcdir)/program_builder.hh.gen.py
 program_builder.hh.stamp: $(srcdir)/program_builder.hh.gen.py $(top_srcdir)/dev/nolimips.xml
 	@rm -rf $@.tmp
 	@touch $@.tmp
-	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/program_builder.hh.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
+	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" @PYTHON2@ $(srcdir)/program_builder.hh.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
 	@mv -f $@.tmp $@
 program_builder.hh: program_builder.hh.stamp
 
@@ -33,7 +34,7 @@ EXTRA_DIST += $(srcdir)/program_solver.gen.py
 program_solver.stamp: $(srcdir)/program_solver.gen.py $(top_srcdir)/dev/nolimips.xml
 	@rm -rf $@.tmp
 	@touch $@.tmp
-	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/program_solver.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
+	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" @PYTHON2@ $(srcdir)/program_solver.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
 	@mv -f $@.tmp $@
 program_solver.hh program_solver.cc: program_solver.stamp
 
diff --git a/src/parse/Makefile.am b/src/parse/Makefile.am
index f19a240..727b78e 100644
--- a/src/parse/Makefile.am
+++ b/src/parse/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = $(srcdir)/asm-scan.ll.gen.py
 asm-scan.ll.stamp: $(srcdir)/asm-scan.ll.gen.py $(top_srcdir)/dev/nolimips.xml
 	@rm -rf $@.tmp
 	@touch $@.tmp
-	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/asm-scan.ll.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
+	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" @PYTHON2@ $(srcdir)/asm-scan.ll.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
 	@mv -f $@.tmp $@
 $(srcdir)/asm-scan.ll: asm-scan.ll.stamp
 
@@ -26,7 +26,7 @@ EXTRA_DIST += $(srcdir)/asm-parse.yy.gen.py
 asm-parse.yy.stamp: $(srcdir)/asm-parse.yy.gen.py $(top_srcdir)/dev/nolimips.xml
 	@rm -rf $@.tmp
 	@touch $@.tmp
-	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/asm-parse.yy.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
+	PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" @PYTHON2@ $(srcdir)/asm-parse.yy.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
 	@mv -f $@.tmp $@
 $(srcdir)/asm-parse.yy: asm-parse.yy.stamp
 
-- 
1.9.0

