mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 06:58:39 +01:00
treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user