diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-11-01 13:35:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 13:35:54 +0100 |
| commit | c212c4aaee66ed42ad3a2c2c71c1e572598bcaed (patch) | |
| tree | 52ef7f3c0d3c46d7a670b12e92a6ddd60b80f322 /lang/python3 | |
| parent | e08d70d8aa6818bb4666db1305f1d327dad537c8 (diff) | |
| parent | 4a083de4a962b5011eb72c51758f42b07e34c57b (diff) | |
Merge pull request #3433 from jow-/python-use-staging-dir-hostpkg
python, python3: use STAGING_DIR_HOSTPKG
Diffstat (limited to 'lang/python3')
| -rw-r--r-- | lang/python3/files/python3-package.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk index 3f8e24e5c..1a12d13dd 100644 --- a/lang/python3/files/python3-package.mk +++ b/lang/python3/files/python3-package.mk @@ -5,8 +5,11 @@ # See /LICENSE for more information. # -# For HOST_BUILD_PREFIX -include $(INCLUDE_DIR)/host-build.mk +# Compatibility fallback for older OpenWrt and LEDE versions +ifeq ($(STAGING_DIR_HOSTPKG),) + $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host) + STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host +endif PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=5 @@ -23,8 +26,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages PYTHON3:=python$(PYTHON3_VERSION) -HOST_PYTHON3_LIB_DIR:=$(HOST_BUILD_PREFIX)/lib/python$(PYTHON3_VERSION) -HOST_PYTHON3_BIN:=$(HOST_BUILD_PREFIX)/bin/python3 +HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOSTPKG)/lib/python$(PYTHON3_VERSION) +HOST_PYTHON3_BIN:=$(STAGING_DIR_HOSTPKG)/bin/python3 PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) define HostPython3 |