From 8a7fd14ad424a235e7947a5bbb4b9531464f6ba8 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 22 Dec 2009 17:17:55 +0000 Subject: insane.bbclass: special case gettext as it can't depend on itself Only run the gettext section of the QA configure sanity check if the package is not gettext as the gettext tools, shipped with gettext, use the macro employed in the sanity check. Signed-off-by: Joshua Lock --- meta/classes/insane.bbclass | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 9fc8873f22..9bddb9bd42 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -500,14 +500,15 @@ 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 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" - else: - gt = "gettext" - deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "") - if gt not in deps: - 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" % config) + if "gettext" not in bb.data.getVar('P', d, True): + 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" + else: + gt = "gettext" + deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "") + if gt not in deps: + 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" % config) } -- cgit v1.2.3