diff options
| author | Khem Raj <raj.khem@gmail.com> | 2011-04-22 11:28:08 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-04 00:54:47 +0100 |
| commit | 499a7b911cdfb1f1ac3784f28e860930b014a941 (patch) | |
| tree | 2e8c1e3ecaf989ba5f6775f3cf13bde6a55f7f5c /meta/classes | |
| parent | 5ce6cc445a4e28b9afbc4d2b4697792294bcdf66 (diff) | |
| download | ast2050-yocto-poky-499a7b911cdfb1f1ac3784f28e860930b014a941.zip ast2050-yocto-poky-499a7b911cdfb1f1ac3784f28e860930b014a941.tar.gz | |
insane.bbclass: Checking for NLS too when checking gettext dependency
Checking for gettext is not needed when --disable-nls is used
Let user know what variant of gettext is missing e.g. gettext-native,
gettext-nativesdk etc, reveals a bit more for user
Check for virtual/gettext
(From OE-Core rev: 7d4cb46017616867dea589be03973897a02991eb)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/insane.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index a3ea0e5..742be5e 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -578,7 +578,8 @@ Rerun configure task after fixing this. The path was '%s'""" % root) if "configure.in" in files: configs.append(os.path.join(root, "configure.in")) - if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True): + cnf = bb.data.getVar('EXTRA_OECONF', d, True) or "" + if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True) and "--disable-nls" not in cnf: if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d): gt = "gettext-native" elif bb.data.inherits_class('cross-canadian', d): @@ -590,8 +591,8 @@ Rerun configure task after fixing this. The path was '%s'""" % root) for config in configs: gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config if os.system(gnu) == 0: - bb.fatal("""Gettext required but not in DEPENDS for file %s. -Missing inherit gettext?""" % config) + bb.fatal("""%s required but not in DEPENDS for file %s. +Missing inherit gettext?""" % (gt, config)) if not package_qa_check_license(workdir, d): bb.fatal("Licensing Error: LIC_FILES_CHKSUM does not match, please fix") |
