summaryrefslogtreecommitdiff
path: root/lang/python/files/python-host.mk
diff options
context:
space:
mode:
authorAlexandru Ardelean <ardeleanalex@gmail.com>2016-04-14 11:54:40 +0300
committerAlexandru Ardelean <ardeleanalex@gmail.com>2016-04-14 11:56:21 +0300
commitc8e8aae57916703b208a51d72a8259232f9b6693 (patch)
treeb76f38e0a3600c86b5b8f380bfbf4c81b5a94707 /lang/python/files/python-host.mk
parentfb9a4c8823bb0d998ba28557c7f4fa5cced99c13 (diff)
python: change $(STAGING_DIR)/host to $(STAGING_DIR_HOST)
It seems that this can become an issue. Found when building python3-setuptools from packages/trunk in openwrt/15.05. python3-setuptools is not in packages/for-15.05 Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Diffstat (limited to 'lang/python/files/python-host.mk')
-rw-r--r--lang/python/files/python-host.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk
index 8736d29ad..671189c32 100644
--- a/lang/python/files/python-host.mk
+++ b/lang/python/files/python-host.mk
@@ -1,11 +1,11 @@
#
-# Copyright (C) 2015-2016 OpenWrt.org
+# Copyright (C) 2016-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-HOST_PYTHON_DIR:=$(STAGING_DIR)/host
+HOST_PYTHON_DIR:=$(STAGING_DIR_HOST)
HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION)
HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION)
@@ -13,7 +13,7 @@ HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages
HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION)
-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
if [ "$(strip $(3))" == "HOST" ]; then \
@@ -44,7 +44,7 @@ define Build/Compile/HostPyMod
LDSHARED="$(HOSTCC) -shared" \
CFLAGS="$(HOST_CFLAGS)" \
CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \
- LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR)/host/lib" \
+ LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR_HOST)/lib" \
_PYTHON_HOST_PLATFORM=linux2 \
$(3) \
, \