diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2016-04-15 10:32:17 +0300 |
|---|---|---|
| committer | Alexandru Ardelean <ardeleanalex@gmail.com> | 2016-04-15 12:11:21 +0300 |
| commit | eec85f0ce74e02f5c463e6d2b5a2906f9fbca77b (patch) | |
| tree | 191ee79b2032e561c0937af414742bfb93727f80 /lang/python/files/python-host.mk | |
| parent | bfdf179f212ab2be2081950932512f903a833582 (diff) | |
python: revert $(STAGING_DIR)/host to $(STAGING_DIR)/host change
Also, override all prefix args in the HOST_CONFIGURE_ARGS
so that this works fine on CC/15.05.
There are some changes in core regarding package builds that
require this.
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.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 671189c32..8736d29ad 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -1,11 +1,11 @@ # -# Copyright (C) 2016-2016 OpenWrt.org +# Copyright (C) 2015-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) \ , \ |