X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fhost-build.mk;h=2950ec721731dbeb2486ad625eec0e8a358d8550;hp=56d5396808a84b8ab6d3c3d503d009f766e33312;hb=3b1d53fc44edfb20e5ea8b6b3950f45aecdca8a7;hpb=9beaac95cfdcdb47053000686efe036e3d402795 diff --git a/include/host-build.mk b/include/host-build.mk index 56d539680..2950ec721 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -9,16 +9,17 @@ include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk -STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared -STAMP_CONFIGURED=$(PKG_BUILD_DIR)/.configured -STAMP_BUILT=$(PKG_BUILD_DIR)/.built +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 $(PKG_UNPACK) - @if [ -d ./patches ]; then \ - $(PATCH) $(PKG_BUILD_DIR) ./patches; \ - fi + $(Build/Patch) endef endif @@ -29,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" \ @@ -80,7 +82,7 @@ endif ifneq ($(CONFIG_AUTOREBUILD),) define HostBuild/Autoclean $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) - $(call rdep,${CURDIR},$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s)) + $(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 @@ -102,7 +104,7 @@ define HostBuild $(STAMP_BUILT): $(STAMP_CONFIGURED) $(call Build/Compile) - @$(MAKE) $(PKG_BUILD_DIR)/.dep_files + @$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files touch $$@ $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT)