From 91b87876f649ad7b7416f2eb8a625021462be34b Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 15 Oct 2019 12:06:12 +0200 Subject: ptxd_lib_dgen: fix _CONFIG handling Don't evaluate _CONFIG when it's not needed and only undefine it when the variable is actually empty. Signed-off-by: Michael Olbrich (cherry picked from commit 08f7e13bb0558eca32c5ed7a69c2b03ab30c3d34) Signed-off-by: Michael Olbrich --- scripts/lib/ptxd_lib_dgen.awk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index 0aa1901f0..c11c65e67 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -371,14 +371,15 @@ function write_deps_pkg_active_cfghash(this_PKG, this_pkg) { print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; - print this_PKG "_CONFIG := $(" this_PKG "_CONFIG)" > DGEN_DEPS_POST; print "ifeq ($(PTXDIST_PKGHASH_MAKE),)" > DGEN_DEPS_POST; + print this_PKG "_CONFIG := $(" this_PKG "_CONFIG)" > DGEN_DEPS_POST; + print "ifeq ($(" this_PKG "_CONFIG),)" > DGEN_DEPS_POST; + print "undefine " this_PKG "_CONFIG" > DGEN_DEPS_POST; + print "endif" > DGEN_DEPS_POST; print "ifneq ($(filter /%,$(" this_PKG "_CONFIG)),)" > DGEN_DEPS_POST; print "ifneq ($(wildcard $(" this_PKG "_CONFIG)),)" > DGEN_DEPS_POST; print "$(file >>" PTXDIST_TEMPDIR "/pkghash.list,CONFIG: " this_PKG " $(" this_PKG "_CONFIG))" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; - print "else" > DGEN_DEPS_POST; - print "undefine " this_PKG "_CONFIG" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; } -- cgit v1.2.3