diff options
| -rw-r--r-- | meta/classes/gettext.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/insane.bbclass | 6 |
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): return '--disable-nls' return "--enable-nls" -DEPENDS_GETTEXT ??= "virtual/gettext gettext-native" +DEPENDS_GETTEXT ??= "gettext-native" BASEDEPENDS_append = " ${@gettext_dependencies(d)}" EXTRA_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.""") cnf = d.getVar('EXTRA_OECONF') or "" if "gettext" not in d.getVar('P') and "gcc-runtime" not in d.getVar('P') and "--disable-nls" not in cnf: ml = d.getVar("MLPREFIX") or "" - 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): + if bb.data.inherits_class('cross-canadian', d): gt = "nativesdk-gettext" else: - gt = "virtual/" + ml + "gettext" + gt = "gettext-native" deps = bb.utils.explode_deps(d.getVar('DEPENDS') or "") if gt not in deps: for config in configs: |