domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a rebuild bug related to quilt

Browse Source 
SVN-Revision: 8255
This commit is contained in:
Felix Fietkau
2007-07-30 23:52:17 +00:00
parent 3125d81ee1
commit 23f0017829
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/depends.mk
View File

@@ -19,11 +19,13 @@ define rdep
) )
ifneq ($(3),) 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) $(2): $(3)
endif endif
endif
$(3): FORCE $(3): FORCE
@-find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s > $$@ @-find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s > $$@
endif .PRECIOUS: $(3)
endef endef

3
include/host-build.mk
View File

@@ -80,7 +80,7 @@ ifneq ($(strip $(PKG_SOURCE)),)
$(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE) $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
endif endif
ifneq ($(CONFIG_AUTOREBUILD),) ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
define HostBuild/Autoclean define HostBuild/Autoclean
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
$(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED)) $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
@@ -105,7 +105,6 @@ define HostBuild
$(STAMP_BUILT): $(STAMP_CONFIGURED) $(STAMP_BUILT): $(STAMP_CONFIGURED)
$(call Build/Compile) $(call Build/Compile)
@$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files
touch $$@ touch $$@
$(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT) $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT)

4
include/package.mk
View File

@@ -28,7 +28,7 @@ override MAKEFLAGS=
export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),) ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
ifneq ($(CONFIG_AUTOREBUILD),) ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
define Build/Autoclean define Build/Autoclean
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
$(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED)) $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
@@ -37,6 +37,7 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
endif endif
endif endif
define Build/DefaultTargets define Build/DefaultTargets
ifneq ($(strip $(PKG_SOURCE_URL)),) ifneq ($(strip $(PKG_SOURCE_URL)),)
download: $(DL_DIR)/$(PKG_SOURCE) download: $(DL_DIR)/$(PKG_SOURCE)
@@ -62,7 +63,6 @@ define Build/DefaultTargets
$(STAMP_BUILT): $(STAMP_CONFIGURED) $(STAMP_BUILT): $(STAMP_CONFIGURED)
$(Build/Compile) $(Build/Compile)
@$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files
touch $$@ touch $$@
ifdef Build/InstallDev ifdef Build/InstallDev