aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2016-09-26 21:14:50 +0800
committerJohn Crispin <john@phrozen.org>2016-10-15 11:36:51 +0200
commit4eb371e363587e4fd1f685c99f654895e198c517 (patch)
treeed92ce6722f8cf2a98276f73054c255036c337d5
parentc511795f47ddbe7413e07a499f7ff59715ed088a (diff)
downloadupstream-4eb371e363587e4fd1f685c99f654895e198c517.tar.gz
upstream-4eb371e363587e4fd1f685c99f654895e198c517.tar.bz2
upstream-4eb371e363587e4fd1f685c99f654895e198c517.zip
build: fix cleaning configured stamp file
We have packages with their own parts appended to standard STAMP_CONFIGURED (mostly with an underscore character). This will render the current STAMP_CONFIGURED_WILD setting invalid and the build system may miss a rebuild on config change 1. Build with config A 2. Build with config B, yet .configured_A_xx did not get cleaned 3. Return to config A, but rebuild will not happen because stamp file of config A still exists Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
-rw-r--r--include/package.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package.mk b/include/package.mk
index fa5c4e7d5d..99e401e859 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -64,7 +64,7 @@ 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_WILDCARD=$(patsubst %_$(call confvar,$(PKG_CONFIG_DEPENDS)),%_*,$(STAMP_CONFIGURED))
+STAMP_CONFIGURED_WILDCARD=$(PKG_BUILD_DIR)/.configured_*
STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_DIR_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),)_installed