mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:03:20 +02:00
fix a rebuild bug related to quilt
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8255 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
974d084f9d
commit
37cc74a265
@ -19,11 +19,13 @@ define rdep
|
||||
)
|
||||
|
||||
ifneq ($(3),)
|
||||
ifneq ($$(shell find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s),$(if $(3),$(shell cat $(3) 2>/dev/null)))
|
||||
ifneq ($$(shell find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s),$(if $(3),$(shell cat $(3) || touch $(3) 2>/dev/null)))
|
||||
$(2): $(3)
|
||||
endif
|
||||
|
||||
$(3): FORCE
|
||||
@-find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s > $$@
|
||||
endif
|
||||
|
||||
$(3): FORCE
|
||||
@-find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s > $$@
|
||||
.PRECIOUS: $(3)
|
||||
endef
|
||||
|
@ -80,7 +80,7 @@ ifneq ($(strip $(PKG_SOURCE)),)
|
||||
$(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_AUTOREBUILD),)
|
||||
ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
|
||||
define HostBuild/Autoclean
|
||||
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
|
||||
$(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
|
||||
@ -105,7 +105,6 @@ define HostBuild
|
||||
|
||||
$(STAMP_BUILT): $(STAMP_CONFIGURED)
|
||||
$(call Build/Compile)
|
||||
@$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files
|
||||
touch $$@
|
||||
|
||||
$(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT)
|
||||
|
@ -28,7 +28,7 @@ override MAKEFLAGS=
|
||||
export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
|
||||
|
||||
ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
|
||||
ifneq ($(CONFIG_AUTOREBUILD),)
|
||||
ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
|
||||
define Build/Autoclean
|
||||
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
|
||||
$(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
|
||||
@ -37,6 +37,7 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
define Build/DefaultTargets
|
||||
ifneq ($(strip $(PKG_SOURCE_URL)),)
|
||||
download: $(DL_DIR)/$(PKG_SOURCE)
|
||||
@ -62,7 +63,6 @@ define Build/DefaultTargets
|
||||
|
||||
$(STAMP_BUILT): $(STAMP_CONFIGURED)
|
||||
$(Build/Compile)
|
||||
@$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files
|
||||
touch $$@
|
||||
|
||||
ifdef Build/InstallDev
|
||||
|
Loading…
Reference in New Issue
Block a user