Browse Source

python: fix HostPython host/target selection

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
lilik-openwrt-22.03
Alexandru Ardelean 9 years ago
parent
commit
779643e358
2 changed files with 11 additions and 9 deletions
  1. +11
    -7
      lang/python/files/python-host.mk
  2. +0
    -2
      lang/python/files/python-package.mk

+ 11
- 7
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) HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR_HOST)/$(HOST_PYTHON_PKG_DIR)
define HostPython 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 endif
( export PYTHONPATH="$(3)"; \
( export PYTHONPATH="$(LOCAL_PYTHONPATH)"; \
export PYTHONOPTIMIZE=""; \ export PYTHONOPTIMIZE=""; \
export PYTHONDONTWRITEBYTECODE=1; \ 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) \ $(1) \
$(HOST_PYTHON_BIN) $(2); \ $(HOST_PYTHON_BIN) $(2); \
) )
@ -52,7 +56,7 @@ define Build/Compile/HostPyMod
, \ , \
./setup.py $(2) \ ./setup.py $(2) \
, \ , \
$(HOST_PYTHONPATH) \
HOST \
) )
endef endef

+ 0
- 2
lang/python/files/python-package.mk View File

@ -105,8 +105,6 @@ define Build/Compile/PyMod
$(3) \ $(3) \
, \ , \
./setup.py $(2) \ ./setup.py $(2) \
, \
$(PYTHONPATH) \
) )
find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
endef endef


Loading…
Cancel
Save