Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2109 from commodo/python2-fix

Browse source 
python: fix HostPython host/target selection
This commit is contained in:
Hannu Nyman 2015-12-11 17:33:01 +02:00
commit 7aa4b19f97
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lang/python/files/python-host.mk
View file

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

2
lang/python/files/python-package.mk
View file

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