summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-05 19:09:40 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-05 19:09:40 +0000
commit07fb519091124b141c17f4760770f50490fc945f (patch)
tree44c55b4f4ab8e9bb044df8a2ed13ec807755bc0c /include
parent44c760170bbdacf8a9fda072d320ad233c8da823 (diff)
build: improve reliability of PKG_CONFIG_DEPENDS, remove old .configured_* stamps before creating a new one
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/package.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/package.mk b/include/package.mk
index c0c91946d4..e39a6598e0 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -33,6 +33,7 @@ else
STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))
endif
STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
+STAMP_CONFIGURED_WILDCARD=$(patsubst %_$(call confvar,$(PKG_CONFIG_DEPENDS)),%_*,$(STAMP_CONFIGURED))
STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed
@@ -131,6 +132,7 @@ define Build/DefaultTargets
$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
$(Build/Configure)
$(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep))
+ rm -f $(STAMP_CONFIGURED_WILDCARD)
touch $$@
$(call Build/Exports,$(STAMP_BUILT))