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 <mschiffer@universe-factory.net>

diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk
index 7833a0c736ba3d3bb33877bfb91576262d4aa8e0..ff2ed57d98107fe0d60a0e236262dc5d403d7303 100644 (file)
--- 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
index 278b90d90ce1e7a60aaa5c61e3fab2941c9dc20b..e9677734fb71b8536e9c2968c02e229447319f8c 100644 (file)
--- 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)