diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-06-29 21:14:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-29 21:14:06 +0300 |
| commit | 3770ff3a69cc744ea9743863b1973329dbe10fc3 (patch) | |
| tree | ce22cc37e1593a491400ce1181f9ddc4df193027 /net | |
| parent | b374b0fa60cc0f92ec17c2b48ef9e3864cff243b (diff) | |
| parent | e88e35249f06a8fe7c543572fb424b752fec22d0 (diff) | |
Merge pull request #4524 from commodo/more-fix-ovs
openvswitch: fix build
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/Makefile | 9 | ||||
| -rw-r--r-- | net/openvswitch/patches/0003-override-pythonpath-via-make-vars.patch | 26 |
2 files changed, 32 insertions, 3 deletions
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 9ed3a3f02..39897036d 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -23,7 +23,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://openvswitch.org/releases/ PKG_HASH:=e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e -PKG_BUILD_DEPENDS:=python-six/host +PKG_BUILD_DEPENDS:=python/host python-six/host CONFIG_PACKAGE_openvswitch-python PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf @@ -67,7 +67,7 @@ endef define Package/openvswitch-python $(call Package/openvswitch/Default) TITLE:=Open vSwitch Python Support - DEPENDS:=+openvswitch +python +python-six + DEPENDS:=+openvswitch +PACKAGE_openvswitch-python:python +PACKAGE_openvswitch-python:python-six endef define Package/openvswitch-python/description @@ -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) + + |