summaryrefslogtreecommitdiff
path: root/rules.mk
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2017-02-24 12:16:33 +0100
committerJo-Philipp Wich <jo@mein.io>2017-12-12 15:40:41 +0100
commit4af145ea670d5cc0513948c9265f289b0a2fa844 (patch)
treec8e8b214ac617c40e8e1d36021141f26ab90d4f5 /rules.mk
parent2b664499cd6223b8063c648d8b1499431bc1103f (diff)
downloadmtk-20170518-4af145ea670d5cc0513948c9265f289b0a2fa844.zip
mtk-20170518-4af145ea670d5cc0513948c9265f289b0a2fa844.tar.gz
mtk-20170518-4af145ea670d5cc0513948c9265f289b0a2fa844.tar.bz2
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)
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules.mk b/rules.mk
index 04fd936..d58f8d9 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 = (