gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-23 11:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvswitch: enforce the use of the python binary from packages

Browse Source 
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>
This commit is contained in:
Alexandru Ardelean
2017-06-17 22:05:08 +03:00
parent 1359e072be
commit e26a34c6b4
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net/openvswitch/patches/0003-override-pythonpath-via-make-vars.patch Normal file
View File

@@ -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)