X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b8885f1f93a2d6cf32afdf2e59f87a837a0d4de7..1f088ed0f35cec10ae1e483a63492dacc066d8db:/include/host-build.mk

diff --git a/include/host-build.mk b/include/host-build.mk
index 5670b6f17..2950ec721 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -5,36 +5,21 @@
 # See /LICENSE for more information.
 #
 
-include $(TOPDIR)/.host.mk
-
-$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host-build.mk
-	echo "HOST_OS:=`uname`" > $@
-	echo "HOST_ARCH:=` \
-		$(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-			-e 's/sparc.*/sparc/' \
-			-e 's/arm.*/arm/' \
-			-e 's/m68k.*/m68k/' \
-			-e 's/ppc/powerpc/' \
-			-e 's/v850.*/v850/' \
-			-e 's/sh[234]/sh/' \
-			-e 's/mips-.*/mips/' \
-			-e 's/mipsel-.*/mipsel/' \
-			-e 's/cris.*/cris/' \
-			-e 's/i[3-9]86/i386/'`" >> $@
-	echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@
-
-
-ifneq ($(strip $(PKG_CAT)),)
-  ifeq ($(PKG_CAT),unzip)
-    UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
-  else
-    UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
-  endif
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/depends.mk
+
+STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared_$(shell find ${CURDIR} $(PKG_FILE_DEPEND) $(DEP_FINDPARAMS) | md5s)
+STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
+STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+
+include $(INCLUDE_DIR)/quilt.mk
+
+Build/Patch:=$(Build/Patch/Default)
+ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
-  	$(UNPACK)
-	@if [ -d ./patches ]; then \
-		$(PATCH) $(PKG_BUILD_DIR) ./patches; \
-	fi
+  	$(PKG_UNPACK)
+	$(Build/Patch)
   endef
 endif
 
@@ -45,6 +30,7 @@ endef
 define Build/Configure/Default
 	@(cd $(PKG_BUILD_DIR)/$(3); \
 	[ -x configure ] && \
+		$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \
 		$(2) \
 		CPPFLAGS="-I$(STAGING_DIR)/host/include" \
 		LDFLAGS="-L$(STAGING_DIR)/host/lib" \
@@ -90,30 +76,44 @@ ifneq ($(strip $(PKG_SOURCE)),)
 	mkdir -p $(DL_DIR)
 	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
 
-  $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+  $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
+endif
+
+ifneq ($(CONFIG_AUTOREBUILD),)
+  define HostBuild/Autoclean
+    $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
+    $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
+    $(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*")
+  endef
 endif
 
 define HostBuild
-  $(PKG_BUILD_DIR)/.prepared:
+  ifeq ($(DUMP),)
+    $(call HostBuild/Autoclean)
+  endif
+  
+  $(STAMP_PREPARED):
 	@-rm -rf $(PKG_BUILD_DIR)
 	@mkdir -p $(PKG_BUILD_DIR)
 	$(call Build/Prepare)
 	touch $$@
 
-  $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED)
 	$(call Build/Configure)
 	touch $$@
 
-  $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+  $(STAMP_BUILT): $(STAMP_CONFIGURED)
 	$(call Build/Compile)
+	@$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files
 	touch $$@
 
-  $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
+  $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT)
 	$(call Build/Install)
+	mkdir -p $$(shell dirname $$@)
 	touch $$@
 	
   ifdef Build/Install
-    install-targets: $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+    install: $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
   endif
 
   package-clean: FORCE
@@ -122,18 +122,11 @@ define HostBuild
 	rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
 
   download:
-  prepare: $(PKG_BUILD_DIR)/.prepared
-  configure: $(PKG_BUILD_DIR)/.configured
-
-  compile-targets: $(PKG_BUILD_DIR)/.built
-  compile: compile-targets
-
-  install-targets:
-  install: install-targets
-
-  clean-targets:
+  prepare: $(STAMP_PREPARED)
+  configure: $(STAMP_CONFIGURED)
+  compile: $(STAMP_BUILT)
+  install:
   clean: FORCE
-	@$(MAKE) clean-targets
 	$(call Build/Clean)
 	rm -rf $(PKG_BUILD_DIR)