aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-05 19:09:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-05 19:09:40 +0000
commitedb862e8ececfb8f9569a505c57201fcb2ce703c (patch)
treea1f4ef50fd51510f429ba22f6ec7f27d6fcaef00
parentfcea88e3b5e058da6260d26764d604097cb763a4 (diff)
downloadupstream-edb862e8ececfb8f9569a505c57201fcb2ce703c.tar.gz
upstream-edb862e8ececfb8f9569a505c57201fcb2ce703c.tar.bz2
upstream-edb862e8ececfb8f9569a505c57201fcb2ce703c.zip
build: improve reliability of PKG_CONFIG_DEPENDS, remove old .configured_* stamps before creating a new one
SVN-Revision: 28770
-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))