summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/gettext.bbclass2
-rw-r--r--meta/classes/insane.bbclass6
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 689ef55ed1..da68e63242 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -13,7 +13,7 @@ def gettext_oeconf(d):
13 return '--disable-nls' 13 return '--disable-nls'
14 return "--enable-nls" 14 return "--enable-nls"
15 15
16DEPENDS_GETTEXT ??= "virtual/gettext gettext-native" 16DEPENDS_GETTEXT ??= "gettext-native"
17 17
18BASEDEPENDS_append = " ${@gettext_dependencies(d)}" 18BASEDEPENDS_append = " ${@gettext_dependencies(d)}"
19EXTRA_OECONF_append = " ${@gettext_oeconf(d)}" 19EXTRA_OECONF_append = " ${@gettext_oeconf(d)}"
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index fe0d744eb3..3906ba797e 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1178,12 +1178,10 @@ Rerun configure task after fixing this.""")
1178 cnf = d.getVar('EXTRA_OECONF') or "" 1178 cnf = d.getVar('EXTRA_OECONF') or ""
1179 if "gettext" not in d.getVar('P') and "gcc-runtime" not in d.getVar('P') and "--disable-nls" not in cnf: 1179 if "gettext" not in d.getVar('P') and "gcc-runtime" not in d.getVar('P') and "--disable-nls" not in cnf:
1180 ml = d.getVar("MLPREFIX") or "" 1180 ml = d.getVar("MLPREFIX") or ""
1181 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): 1181 if bb.data.inherits_class('cross-canadian', d):
1182 gt = "gettext-native"
1183 elif bb.data.inherits_class('cross-canadian', d):
1184 gt = "nativesdk-gettext" 1182 gt = "nativesdk-gettext"
1185 else: 1183 else:
1186 gt = "virtual/" + ml + "gettext" 1184 gt = "gettext-native"
1187 deps = bb.utils.explode_deps(d.getVar('DEPENDS') or "") 1185 deps = bb.utils.explode_deps(d.getVar('DEPENDS') or "")
1188 if gt not in deps: 1186 if gt not in deps:
1189 for config in configs: 1187 for config in configs: