- introduce HOST_DEPS_DIR

make/bootstrap.mk

@@ -90,6 +90,7 @@ $(UPDATE_DIR) \
 $(HOST_DIR):
 	mkdir -p $(@)
 
+$(HOST_DEPS_DIR) \
 $(HOST_DIR)/bin: $(HOST_DIR)
 	mkdir -p $(@)
 

make/environment-build.mk

@@ -36,7 +36,6 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x))
 endif
 DEPS_DIR      = $(BASE_DIR)/deps
 D             = $(DEPS_DIR)
-HOST_DIR      = $(BASE_DIR)/host
 TARGET_DIR   ?= $(BASE_DIR)/root
 SOURCE_DIR   ?= $(BASE_DIR)/source
 MAKE_DIR      = $(BASE_DIR)/make
@@ -61,6 +60,11 @@ BUILD        ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/shar
 
 # -----------------------------------------------------------------------------
 
+HOST_DIR      = $(BASE_DIR)/host
+HOST_DEPS_DIR = $(HOST_DIR)/deps
+
+# -----------------------------------------------------------------------------
+
 PKG_NAME        = $(basename $(@F))
 PKG_UPPER       = $(call UPPERCASE,$(PKG_NAME))
 PKG_LOWER       = $(call LOWERCASE,$(PKG_NAME))
@@ -182,7 +186,7 @@ TERM_NORMAL	= \033[0m
 # -----------------------------------------------------------------------------
 
 # search path(s) for all prerequisites
-VPATH = $(D)
+VPATH = $(DEPS_DIR) $(HOST_DEPS_DIR)
 
 PATH := $(HOST_DIR)/bin:$(CROSS_DIR)/bin:$(PATH)
 
@@ -212,7 +216,9 @@ CD    = set -e; cd
 CHDIR = $(CD) $(BUILD_TMP)
 MKDIR = mkdir -p $(BUILD_TMP)
 CPDIR = cp -a -t $(BUILD_TMP) $(ARCHIVE)
-TOUCH = @touch $(D)/$(@)
+#TOUCH = @touch $(DEPS_DIR)/$(@)
+TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
+
 
 INSTALL      = install
 INSTALL_DATA = $(INSTALL) -m 0644

make/host-tools.mk

@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-host-preqs: $(HOST_DIR)/bin \
+host-preqs: $(HOST_DIR)/bin $(HOST_DEPS_DIR) \
 	host-pkg-config \
 	$(PKG_CONFIG) \
 	host-mkfs.jffs2 \
@@ -199,7 +199,7 @@ $(HOST_DIR)/bin/parted: $(ARCHIVE)/$(HOST_PARTED_SOURCE) | $(HOST_DIR)/bin
 
 # -----------------------------------------------------------------------------
 
-HOST_DOSFSTOOLS_VER = $(DOSFSTOOLS_VER)
+HOST_DOSFSTOOLS_VER    = $(DOSFSTOOLS_VER)
 HOST_DOSFSTOOLS_TMP    = dosfstools-$(HOST_DOSFSTOOLS_VER)
 HOST_DOSFSTOOLS_SOURCE = dosfstools-$(HOST_DOSFSTOOLS_VER).tar.xz
 HOST_DOSFSTOOLS_SITE   = https://github.com/dosfstools/dosfstools/releases/download/v$(HOST_DOSFSTOOLS_VER)

make/neutrino-plugins.mk

@@ -135,7 +135,7 @@ neutrino-plugins-distclean:
 
 neutrino-plugins-clean: neutrino-plugins-uninstall neutrino-plugins-distclean
 	rm -f $(NP_OBJ_DIR)/config.status
-	rm -f $(D)/neutrino-plugins
+	rm -f $(DEPS_DIR)/neutrino-plugins
 
 neutrino-plugins-clean-all: neutrino-plugins-clean
 	rm -rf $(NP_OBJ_DIR)

make/neutrino.mk

@@ -253,7 +253,7 @@ neutrino-distclean:
 
 neutrino-clean: neutrino-uninstall neutrino-distclean
 	rm -f $(N_OBJ_DIR)/config.status
-	rm -f $(D)/neutrino
+	rm -f $(DEPS_DIR)/neutrino
 	rm -f $(TARGET_DIR)/etc/init.d/start_neutrino
 
 neutrino-clean-all: neutrino-clean
@@ -269,7 +269,7 @@ libstb-hal-distclean:
 
 libstb-hal-clean: libstb-hal-uninstall libstb-hal-distclean
 	rm -f $(LH_OBJ_DIR)/config.status
-	rm -f $(D)/libstb-hal
+	rm -f $(DEPS_DIR)/libstb-hal
 
 libstb-hal-clean-all: libstb-hal-clean
 	rm -rf $(LH_OBJ_DIR)