summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:32:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:40:40 +0100
commit0e894590172f24bd73e02fd5a462c460466c7c5f (patch)
tree09e36c3bbb6eb3027ff67b495a59618e89c99528
parent39e469cfdbddf5bad10486ca43114bfab907c1b9 (diff)
downloadpoky-0e894590172f24bd73e02fd5a462c460466c7c5f.tar.gz
gettext.bbclass: Updates to better handle gettext alternatives
* Change gettext dependency to virtual/gettext * Ensure INHIBIT_DEFAULT_DEPS removes gettext dependencies * Use BASEDEPENDS to ensure dependencies are added in native/nativesdk cases (From OE-Core rev: d19735ad5a45f969918fb73ea4845bef48d9ee24) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/gettext.bbclass28
-rw-r--r--meta/classes/insane.bbclass2
2 files changed, 15 insertions, 15 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index a40e74f819..6f79e5ee76 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -1,17 +1,17 @@
1def gettext_after_parse(d): 1def gettext_dependencies(d):
2 # Remove the NLS bits if USE_NLS is no. 2 if d.getVar('USE_NLS', True) == 'no':
3 if bb.data.getVar('USE_NLS', d, 1) == 'no': 3 return ""
4 cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d) 4 if bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, True) and not oe.utils.inherits(d, 'cross-canadian'):
5 cfg += " --disable-nls" 5 return ""
6 depends = bb.data.getVar('DEPENDS', d, 1) or "" 6 return d.getVar('DEPENDS_GETTEXT', False)
7 bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
8 bb.data.setVar('EXTRA_OECONF', cfg, d)
9 7
10python () { 8def gettext_oeconf(d):
11 gettext_after_parse(d) 9 # Remove the NLS bits if USE_NLS is no.
12} 10 if d.getVar('USE_NLS', True) == 'no':
11 return '--disable-nls'
12 return "--enable-nls"
13 13
14DEPENDS_GETTEXT = "gettext gettext-native" 14DEPENDS_GETTEXT = "virtual/gettext gettext-native"
15 15
16DEPENDS =+ "${DEPENDS_GETTEXT}" 16BASEDEPENDS =+ "${@gettext_dependencies(d)}"
17EXTRA_OECONF += "--enable-nls" 17EXTRA_OECONF += "${@gettext_oeconf(d)}"
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 98acf7f5a4..a3ea0e5ef0 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -584,7 +584,7 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
584 elif bb.data.inherits_class('cross-canadian', d): 584 elif bb.data.inherits_class('cross-canadian', d):
585 gt = "gettext-nativesdk" 585 gt = "gettext-nativesdk"
586 else: 586 else:
587 gt = "gettext" 587 gt = "virtual/gettext"
588 deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "") 588 deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
589 if gt not in deps: 589 if gt not in deps:
590 for config in configs: 590 for config in configs: