From 69a46639f564d086b1bf6e2a17825a34266019c9 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 25 Feb 2010 18:22:42 +0100 Subject: [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 --- scripts/lib/ptxd_lib_dgen.awk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'scripts/lib/ptxd_lib_dgen.awk') 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; -- cgit v1.2.3