From 465cefb69fc547ff598215cb657985ad482e06cd Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 24 Feb 2017 13:34:27 +0100 Subject: [PATCH] rules.mk: make PKG_CONFIG_DEPENDS properly track string values This will ensure that gluon-site and gluon-autoupdater are rebuilt correctly when GLUON_RELEASE or GLUON_BRANCH change. --- ...DEPENDS-properly-track-string-values.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 patches/lede/0010-rules.mk-make-PKG_CONFIG_DEPENDS-properly-track-string-values.patch diff --git a/patches/lede/0010-rules.mk-make-PKG_CONFIG_DEPENDS-properly-track-string-values.patch b/patches/lede/0010-rules.mk-make-PKG_CONFIG_DEPENDS-properly-track-string-values.patch new file mode 100644 index 00000000..f045f27d --- /dev/null +++ b/patches/lede/0010-rules.mk-make-PKG_CONFIG_DEPENDS-properly-track-string-values.patch @@ -0,0 +1,24 @@ +From: Matthias Schiffer +Date: Fri, 24 Feb 2017 12:16:33 +0100 +Subject: rules.mk: make PKG_CONFIG_DEPENDS properly track string values + +The confvar macro is adjusted to not only consider if a variable has a +value or not, but also the value itself. Instead of creating a string of +'y' and 'n' characters, all variable names and values are concatenated +and hashed. + +Signed-off-by: Matthias Schiffer + +diff --git a/rules.mk b/rules.mk +index 1b9de5f35e3890c2759ab2cdbd98ac80df942124..626bfca1ba73b96ee0f86a2de4afe643d83b360c 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -29,7 +29,7 @@ empty:= + space:= $(empty) $(empty) + comma:=, + merge=$(subst $(space),,$(1)) +-confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n))) ++confvar=$(shell echo '$(foreach v,$(1),$(v)=$(subst ','\'',$($(v))))' | $(STAGING_DIR_HOST)/bin/mkhash md5) + strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1)) + + paren_left = (