lede-packages-rs

commit 7aa4b19f97374b13ee7b43636e31c13bbfdf30f7
parent b01a391c5ea89501f8241baeb071c4a7e1314284
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Fri, 11 Dec 2015 17:33:01 +0200

Merge pull request #2109 from commodo/python2-fix

python: fix HostPython host/target selection
Diffstat:
M
lang/python/files/python-host.mk
 | 
18
+++++++++++-------
M
lang/python/files/python-package.mk
 | 
2
--

2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk
@@ -11,15 +11,19 @@ HOST_PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
 
 HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR_HOST)/$(HOST_PYTHON_PKG_DIR)
 define HostPython
-	ifeq ($(3),)
-		$(3):=$(PYTHONPATH)
+	ifeq ($(strip $(3)),HOST)
+		LOCAL_PYTHONPATH:=$(HOST_PYTHONPATH)
+		LOCAL_STAGING_DIR:=$(STAGING_DIR_HOST)
+	else
+		LOCAL_PYTHONPATH:=$(PYTHONPATH)
+		LOCAL_STAGING_DIR:=$(STAGING_DIR)
 	endif
-	(	export PYTHONPATH="$(3)"; \
+	(	export PYTHONPATH="$(LOCAL_PYTHONPATH)"; \
 		export PYTHONOPTIMIZE=""; \
 		export PYTHONDONTWRITEBYTECODE=1; \
-		export _python_sysroot="$(STAGING_DIR_HOST)"; \
-		export _python_prefix=""; \
-		export _python_exec_prefix=""; \
+		export _python_sysroot="$(LOCAL_STAGING_DIR)/usr"; \
+		export _python_prefix="/usr"; \
+		export _python_exec_prefix="/usr"; \
 		$(1) \
 		$(HOST_PYTHON_BIN) $(2); \
 	)
@@ -52,7 +56,7 @@ define Build/Compile/HostPyMod
 		, \
 		./setup.py $(2) \
 		, \
-		$(HOST_PYTHONPATH) \
+		HOST \
 	)
 endef
 
diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk
@@ -105,8 +105,6 @@ define Build/Compile/PyMod
 		$(3) \
 		, \
 		./setup.py $(2) \
-		, \
-		$(PYTHONPATH) \
 	)
 	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
 endef