diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-02-25 18:22:42 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-02-26 21:04:11 +0100 |
| commit | 69a46639f564d086b1bf6e2a17825a34266019c9 (patch) | |
| tree | f3f0d184fe66833e394b21c0f7893b580aeb0632 /scripts/lib/ptxd_lib_dgen.awk | |
| parent | 5a39b605c77fd01f3bffe0218c6d8de45b1ee353 (diff) | |
| download | ptxdist-69a46639f564d086b1bf6e2a17825a34266019c9.tar.gz ptxdist-69a46639f564d086b1bf6e2a17825a34266019c9.tar.xz | |
[ptxd_lib_dgen] fix autogen_dep for host-packages
Since commit eb18824f0bba81f3b3c961c5886ec9e53eafc0f0 we generate
default package names for host and cross packages.
If we have packages for both host- and target- we both $PKG and $HOST_PKG
defined.
The "autogen_gen" is called like this:
ifneq ($(call autogen_dep,$(" this_PKG ")$(" target_PKG ")),)
relying on the fact that either PKG _or_ HOST_PKG is defined. But since
that commit (eb18824f0bba81f3b3c961c5886ec9e53eafc0f0) this isn't true
anymore.
This patch fixes the problem by just using "this_PKG". Which means the
"autogen_gen" call is the same for host-, cross-, and target- packages.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_lib_dgen.awk')
| -rw-r--r-- | scripts/lib/ptxd_lib_dgen.awk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index 709545ca7..2b1253fcc 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -260,16 +260,8 @@ END { # # conditional dependency on autogen script # - if (!(this_pkg ~ /^host-|^cross-/)) { - print "ifneq ($(" this_PKG "),)" > DGEN_DEPS_POST; - print "ifneq ($(call autogen_dep,$(" this_PKG ")),)" > DGEN_DEPS_POST; - } else { - target_PKG = gensub(/^HOST_/, "", "", this_PKG); - target_PKG = gensub(/^CROSS_/, "", "", target_PKG); - # host/cross packages inherit the package name xor have their own - print "ifneq ($(" this_PKG ")$(" target_PKG "),)" > DGEN_DEPS_POST; - print "ifneq ($(call autogen_dep,$(" this_PKG ")$(" target_PKG ")),)" > DGEN_DEPS_POST; - } + print "ifneq ($(" this_PKG "),)" > DGEN_DEPS_POST; + print "ifneq ($(call autogen_dep,$(" this_PKG ")),)" > DGEN_DEPS_POST; print "$(STATEDIR)/" this_pkg ".extract: $(STATEDIR)/autogen-tools" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; print "endif" > DGEN_DEPS_POST; |