From e26a34c6b4f634240d2dd562efb8649654006b23 Mon Sep 17 00:00:00 2001
From: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Sat, 17 Jun 2017 22:05:08 +0300
Subject: [PATCH] openvswitch: enforce the use of the python binary from
 `packages`

Seems it was not failing for me because it was probably
using my host Python, which may have the `six` package
available.

This patch enforces the use of the packaged Python.
That way, it's more consistent that the python-six
package is available.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 net/openvswitch/Makefile                      |  5 +++-
 ...03-override-pythonpath-via-make-vars.patch | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 net/openvswitch/patches/0003-override-pythonpath-via-make-vars.patch

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 9ed3a3f02..eabe2bc4a 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -118,7 +118,10 @@ CONFIGURE_ARGS += --enable-shared
 TARGET_CFLAGS += -flto -std=gnu99
 
 CONFIGURE_VARS += KARCH=$(LINUX_KARCH)
-MAKE_FLAGS += ARCH="$(LINUX_KARCH)"
+MAKE_FLAGS += \
+	ARCH="$(LINUX_KARCH)" \
+	PYTHONPATH="$(HOST_PYTHONPATH)" \
+	PYTHON="$(HOST_PYTHON_BIN)"
 
 define OvsBinUtility
   define Package/openvswitch-$(1)
diff --git a/net/openvswitch/patches/0003-override-pythonpath-via-make-vars.patch b/net/openvswitch/patches/0003-override-pythonpath-via-make-vars.patch
new file mode 100644
index 000000000..bd1c158a6
--- /dev/null
+++ b/net/openvswitch/patches/0003-override-pythonpath-via-make-vars.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index a4dd7b8..099a3c1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -53,7 +53,7 @@ endif
+ # foo/__init__.py into an (older) version with plain foo.py, since
+ # foo/__init__.pyc will cause Python to ignore foo.py.
+ run_python = \
+-	PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
++	PYTHONPATH=$(top_srcdir)/python$(psep)$(PYTHONPATH) \
+ 	PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
+ 
+ ALL_LOCAL =
+diff --git a/Makefile.in b/Makefile.in
+index 8df66e2..98b54bf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1654,7 +1654,7 @@ AM_CFLAGS = -Wstrict-prototypes $(WARNING_FLAGS) $(OVS_CFLAGS) \
+ # foo/__init__.py into an (older) version with plain foo.py, since
+ # foo/__init__.pyc will cause Python to ignore foo.py.
+ run_python = \
+-	PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
++	PYTHONPATH=$(top_srcdir)/python$(psep)$(PYTHONPATH) \
+ 	PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
+ 
+