python{,3}: remove STAGING_DIR_HOSTPKG fallback definition

STAGING_DIR_HOSTPKG is now defined in both OpenWrt and LEDE, so we can start to rely on it. Signed-off-by: Matthias Schiffer <[email protected]>
notnyt · Jan 10, 2017 · 876d139 · 876d139
1 parent 564b138
commit 876d139
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk
@@ -11,12 +11,6 @@ __python_host_mk_inc=1
 # For PYTHON_VERSION
 $(call include_mk, python-version.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
-
 HOST_PYTHON_DIR:=$(STAGING_DIR_HOSTPKG)
 HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION)
 HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION)

diff --git a/lang/python3/files/python3-host.mk b/lang/python3/files/python3-host.mk
@@ -11,12 +11,6 @@ __python3_host_mk_inc=1
 # For PYTHON3_VERSION
 $(call include_mk, python3-version.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
-
 HOST_PYTHON3_DIR:=$(STAGING_DIR_HOSTPKG)
 HOST_PYTHON3_INC_DIR:=$(HOST_PYTHON3_DIR)/include/python$(PYTHON3_VERSION)
 HOST_PYTHON3_LIB_DIR:=$(HOST_PYTHON3_DIR)/lib/python$(PYTHON3_VERSION)