summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-10-15 12:06:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-10-17 10:02:02 +0200
commit91b87876f649ad7b7416f2eb8a625021462be34b (patch)
tree4ca0b6f2b9236f7e6efb6bc48671468f05ba9422
parentd81497fa6b17f863561158f527143d7fad05f8e9 (diff)
downloadptxdist-stable/ptxdist-2019.10.x.tar.gz
ptxd_lib_dgen: fix <PKG>_CONFIG handlingptxdist-2019.10.1stable/ptxdist-2019.10.x
Don't evaluate <PKG>_CONFIG when it's not needed and only undefine it when the variable is actually empty. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> (cherry picked from commit 08f7e13bb0558eca32c5ed7a69c2b03ab30c3d34) Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--scripts/lib/ptxd_lib_dgen.awk7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
index 0aa1901..c11c65e 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;
}