diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-11-01 12:53:30 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-11-01 12:57:41 +0100 |
| commit | 4a083de4a962b5011eb72c51758f42b07e34c57b (patch) | |
| tree | 52ef7f3c0d3c46d7a670b12e92a6ddd60b80f322 /lang/python3 | |
| parent | 73b7f55424de52d8179a9ad808252fe3bf8dcc9d (diff) | |
python3: avoid use of HOST_BUILD_PREFIX
Currently, the python3-package.mk framework relies on HOST_BUILD_PREFIX to
refer to the $(STAGING_DIR)/host directory but using the HOST_BUILD_PREFIX
variable requires the use of include/host-build.mk which in turn includes
python3-package.mk, leading to target redefinition errors.
In order to provide a global, uniform way to refer to the host staging
directory, LEDE introduced a new variable STAGING_DIR_HOSTPKG which points
to $(STAGING_DIR)/host for now with the purpose of eventually being able to
relocate that directory in the future.
This commit changes python3-package.mk to ...
- stop including include/host-build.mk (revert of #3423)
- replace usages of $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
- warn and fallback to $(STAGING_DIR)/host if STAGING_DIR_HOSTPKG is
unavailable
The fallback code will ensure that the python host build infrastructure
continues to work properly on older OpenWrt and LEDE versions until the
STAGING_DIR_HOSTPKG is fully settled in and can be removed some time
in the future.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
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 |