diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:30:04 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 21:56:03 +0100 |
| commit | 9f8e5aca342c806d1031e063b00a0045e0eb6c57 (patch) | |
| tree | e9547c4e7c77f1db6e1ea8c9c96b36ee548f641f /lang/python | |
| parent | f12aae60ad661a67b45ef4370757fa5236ffffff (diff) | |
treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/Makefile | 16 | ||||
| -rw-r--r-- | lang/python/files/python-host.mk | 8 | ||||
| -rw-r--r-- | lang/python/files/python-package.mk | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile index c8936d226..a75676964 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -144,13 +144,13 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ $(CP) \ - $(STAGING_DIR_HOST)/usr/lib/python$(PYTHON_VERSION) \ + $(STAGING_DIR)/host/usr/lib/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ - $(STAGING_DIR_HOST)/lib/pkgconfig/python.pc \ - $(STAGING_DIR_HOST)/lib/pkgconfig/python2.pc \ - $(STAGING_DIR_HOST)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ + $(STAGING_DIR)/host/lib/pkgconfig/python.pc \ + $(STAGING_DIR)/host/lib/pkgconfig/python2.pc \ + $(STAGING_DIR)/host/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \ @@ -221,16 +221,16 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --prefix=$(STAGING_DIR_HOST)/usr \ - --with-system-expat=$(STAGING_DIR_HOST) \ + --prefix=$(STAGING_DIR)/host/usr \ + --with-system-expat=$(STAGING_DIR)/host \ --with-ensurepip=upgrade \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ + $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(MAKE) -C $(HOST_BUILD_DIR) install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen2 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen2 endef $(eval $(call HostBuild)) diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index b2ed33683..65d9ca51a 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -5,15 +5,15 @@ # See /LICENSE for more information. # -HOST_PYTHON_INC_DIR:=$(STAGING_DIR_HOST)/include/python$(PYTHON_VERSION) +HOST_PYTHON_INC_DIR:=$(STAGING_DIR)/host/include/python$(PYTHON_VERSION) HOST_PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages -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 \ export PYTHONPATH="$(HOST_PYTHONPATH)"; \ - export _python_sysroot="$(STAGING_DIR_HOST)"; \ + export _python_sysroot="$(STAGING_DIR)/host"; \ else \ export PYTHONPATH="$(PYTHONPATH)"; \ export _python_sysroot="$(STAGING_DIR)"; \ @@ -29,7 +29,7 @@ endef # These configure args are needed in detection of path to Python header files # using autotools. HOST_CONFIGURE_ARGS += \ - _python_sysroot="$(STAGING_DIR_HOST)" \ + _python_sysroot="$(STAGING_DIR)/host" \ _python_prefix="/usr" \ _python_exec_prefix="/usr" diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index 0a370c531..e8c049224 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -17,8 +17,8 @@ PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages PYTHON:=python$(PYTHON_VERSION) -HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/usr/lib/python$(PYTHON_VERSION) -HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2 +HOST_PYTHON_LIB_DIR:=$(STAGING_DIR)/host/usr/lib/python$(PYTHON_VERSION) +HOST_PYTHON_BIN:=$(STAGING_DIR)/host/bin/python2 PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) |