libepoxy: Don't try to use python3 during configuration

The scripts use argparse which is only in Python 3.2 onwards, so to avoid
failures on hosts using 3.0 or 3.1 just look for Python 2.

(From OE-Core rev: da889e86bac55178e06b6e2328ddf9415698fd79)

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 21 insertions, 0 deletions

diff --git a/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch b/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch
new file mode 100644
index 0000000000..dc5ef2871c
--- /dev/null
+++ b/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch
@@ -0,0 +1,20 @@
+There is no need to use python3 by this package (the python scripts
+that are using during configuration only need python2.7+)
+
+Upstream-Status: innapropriate [configuration]
+
+Signed-off-by: Gary Thomas <gary@mlbassoc.com>
+--
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -40,7 +40,7 @@ m4_ifndef([XORG_MACROS_VERSION],
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-AC_CHECK_PROGS([PYTHON], [python3 python2 python])
++AC_CHECK_PROGS([PYTHON], [python2 python])
+ 
+ # Initialize libtool
+ AC_DISABLE_STATIC
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_git.bb b/meta/recipes-graphics/libepoxy/libepoxy_git.bb
index 9816257495..535af5d9f1 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_git.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_git.bb
@@ -10,6 +10,7 @@ SRC_URI = " \
     git://github.com/anholt/libepoxy.git \
     file://0001-select-platforms-based-on-configuration-results.patch \
     file://0002-add-an-option-to-disable-glx-support.patch \
+    file://no-need-for-python3.patch \
 "
 SRCREV="20062c25e7612cab023cdef44d3277ba1bd0b2de"
 PV = "1.2+git${SRCPV}"