diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-15 12:06:12 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-17 10:02:02 +0200 |
commit | 91b87876f649ad7b7416f2eb8a625021462be34b (patch) | |
tree | 4ca0b6f2b9236f7e6efb6bc48671468f05ba9422 /scripts/lib/ptxd_lib_dgen.awk | |
parent | d81497fa6b17f863561158f527143d7fad05f8e9 (diff) | |
download | ptxdist-2019.10.1.tar.gz ptxdist-2019.10.1.tar.xz |
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>
Diffstat (limited to 'scripts/lib/ptxd_lib_dgen.awk')
-rw-r--r-- | scripts/lib/ptxd_lib_dgen.awk | 7 |
1 files 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; } |