From 97d7cff5d11ebb256da30c2fbec7a6cde0aa63ec Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 9 Dec 2014 12:42:21 +0200 Subject: [PATCH 1/3] python: add $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) to PYTHONPATH Signed-off-by: Alexandru Ardelean --- lang/python/files/python-package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index b9349f3c1..3a71d09b4 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -21,6 +21,7 @@ HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2 PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR) +PYTHONPATH+=:$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) define HostPython ( export PYTHONPATH="$(PYTHONPATH)"; \ export PYTHONOPTIMIZE=""; \ @@ -79,6 +80,7 @@ endef # $(2) => additional arguments to setup.py # $(3) => additional variables define Build/Compile/PyMod + $(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) $(call HostPython, \ cd $(PKG_BUILD_DIR)/$(strip $(1)); \ CC="$(TARGET_CC)" \ From f51458dfd372de556c6bf0e0955eeb58c51660d1 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 9 Dec 2014 12:43:17 +0200 Subject: [PATCH 2/3] python-pip: remove explicit PYTHONPATH set Signed-off-by: Alexandru Ardelean --- lang/python-pip/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile index c0de9faa3..d7404ba2c 100644 --- a/lang/python-pip/Makefile +++ b/lang/python-pip/Makefile @@ -34,9 +34,7 @@ define Package/python-pip/description A tool for installing and managing Python packages. endef -PYTHONPATH:=$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) define Build/Compile - $(INSTALL_DIR) $(PYTHONPATH) $(call Build/Compile/PyMod,,\ install --prefix="$(PKG_INSTALL_DIR)/usr" \ ) From 465c95ab71eac3d196e649bda7faf120bb9da7e7 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 9 Dec 2014 12:43:41 +0200 Subject: [PATCH 3/3] python-setuptools: remove explicit PYTHONPATH set Signed-off-by: Alexandru Ardelean --- lang/python-setuptools/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile index 91876141a..0511791a7 100644 --- a/lang/python-setuptools/Makefile +++ b/lang/python-setuptools/Makefile @@ -33,9 +33,7 @@ define Package/python-setuptools/description Easily download, build, install, upgrade, and uninstall Python packages endef -PYTHONPATH:=$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) define Build/Compile - $(INSTALL_DIR) $(PYTHONPATH) $(call Build/Compile/PyMod,,\ install --prefix="$(PKG_INSTALL_DIR)/usr" \ )