summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2009-12-22 17:17:55 +0000
committerJoshua Lock <josh@linux.intel.com>2010-01-04 10:34:00 +0000
commit8a7fd14ad424a235e7947a5bbb4b9531464f6ba8 (patch)
tree8b959dd6b6403f0b8ec84d291cc3be5c0acf05bb
parent91d2e7d1bc725f2c3a39b4c7413bf96e85d17375 (diff)
downloadpoky-8a7fd14ad424a235e7947a5bbb4b9531464f6ba8.tar.gz
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 <josh@linux.intel.com>
-rw-r--r--meta/classes/insane.bbclass21
1 files 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)
500 if "configure.in" in files: 500 if "configure.in" in files:
501 configs.append(os.path.join(root, "configure.in")) 501 configs.append(os.path.join(root, "configure.in"))
502 502
503 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): 503 if "gettext" not in bb.data.getVar('P', d, True):
504 gt = "gettext-native" 504 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):
505 else: 505 gt = "gettext-native"
506 gt = "gettext" 506 else:
507 deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "") 507 gt = "gettext"
508 if gt not in deps: 508 deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
509 for config in configs: 509 if gt not in deps:
510 gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config 510 for config in configs:
511 if os.system(gnu) == 0: 511 gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
512 bb.fatal("Gettext required but not in DEPENDS for file %s" % config) 512 if os.system(gnu) == 0:
513 bb.fatal("Gettext required but not in DEPENDS for file %s" % config)
513} 514}