From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 24 Feb 2017 11:16:33 +0000 (+0100)
Subject: rules.mk: make PKG_CONFIG_DEPENDS properly track string values
X-Git-Tag: v17.01.5~309
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4af145ea670d5cc0513948c9265f289b0a2fa844;p=oweals%2Fopenwrt.git

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 <mschiffer@universe-factory.net>
(cherry picked from commit 5ef0854b1109ba2dbd1dd3d9f87ce5801002d0ba)
---

diff --git a/rules.mk b/rules.mk
index 04fd936660..d58f8d92d3 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 = (