- From e451d74788c73e8679e6a2268185a08901ac7f8c Mon Sep 17 00:00:00 2001
- From: Yousong Zhou <zhouyousong@yunionyun.com>
- Date: Tue, 21 Aug 2018 12:21:05 +0000
- Subject: [PATCH 102/107] python: separate host/target python for cross-compile
-
- At the moment, python-six is a requirement for openvswitch python
- library on target machine.
-
- Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
- ---
- Makefile.am | 2 +-
- m4/openvswitch.m4 | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
- diff --git a/Makefile.am b/Makefile.am
- index 788972804..cd90cc176 100644
- --- a/Makefile.am
- +++ b/Makefile.am
- @@ -60,7 +60,7 @@ endif
- # foo/__init__.pyc will cause Python to ignore foo.py.
- run_python = \
- PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
- - PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
- + PYTHONDONTWRITEBYTECODE=yes $(PYTHON_HOST)
-
- ALL_LOCAL =
- BUILT_SOURCES =
- diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
- index 5743f83ce..acb6b140e 100644
- --- a/m4/openvswitch.m4
- +++ b/m4/openvswitch.m4
- @@ -449,7 +449,9 @@ AC_DEFUN([OVS_CHECK_PYTHON],
- fi])
- AC_SUBST([PYTHON])
- PYTHON=$ovs_cv_python
- + PYTHON_HOST=$ovs_cv_python_host
- AC_SUBST([HAVE_PYTHON])
- + AM_MISSING_PROG([PYTHON_HOST], [python])
- HAVE_PYTHON=yes
- AM_CONDITIONAL([HAVE_PYTHON], [test "$HAVE_PYTHON" = yes])])
-
|
