From 2033adee26fb7079c4d9d02f369a6a0dbdacbaa5 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 21 Mar 2015 21:47:53 +0000 Subject: [PATCH] build: define STAMP_CONFIGURED recursively Defining STAMP_CONFIGURED statically caused it not to reflect changes to PKG_CONFIG_DEPENDS made after including package.mk, like the additional options added by feeds.mk for all packages. Furthermore, as STAMP_CONFIGURED_WILDCARD was already defined recursively, the patsubst in its definition would never match, and in consequence, the stamps were never removed. This caused packages not to be rebuilt when they should have been. Signed-off-by: Matthias Schiffer git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44927 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/package.mk b/include/package.mk index 8208e36cfc..b364c3b66a 100644 --- a/include/package.mk +++ b/include/package.mk @@ -98,7 +98,7 @@ ifneq ($(PREV_STAMP_PREPARED),) else STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))$(call confvar,$(PKG_PREPARED_DEPENDS))) endif -STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) +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 -- 2.11.0