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/python3 | |
| 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/python3')
| -rw-r--r-- | lang/python3/Makefile | 12 | ||||
| -rw-r--r-- | lang/python3/files/python3-package.mk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lang/python3/Makefile b/lang/python3/Makefile index 250410756..cdaa93a09 100644 --- a/lang/python3/Makefile +++ b/lang/python3/Makefile @@ -146,7 +146,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ $(CP) \ - $(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \ + $(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ @@ -216,8 +216,8 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --prefix=$(STAGING_DIR_HOST) \ - --with-system-expat=$(STAGING_DIR_HOST) \ + --prefix=$(STAGING_DIR)/host \ + --with-system-expat=$(STAGING_DIR)/host \ --with-ensurepip=upgrade \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" @@ -228,10 +228,10 @@ define Host/Compile endef 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/pgen3 - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR_HOST)/bin/_freeze_importlib + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen3 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR)/host/bin/_freeze_importlib endef $(eval $(call HostBuild)) diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk index 4fd3191eb..4ffb18175 100644 --- a/lang/python3/files/python3-package.mk +++ b/lang/python3/files/python3-package.mk @@ -20,8 +20,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages PYTHON3:=python$(PYTHON3_VERSION) -HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION) -HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3 +HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR)/host/lib/python$(PYTHON3_VERSION) +HOST_PYTHON3_BIN:=$(STAGING_DIR)/host/bin/python3 PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) define HostPython3 |