summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-29 14:10:53 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 12:23:04 +0100
commit1a7b843d575b290917d1e379c2ba106460988230 (patch)
tree2ccfd2e1978c9ee6e9500d1df2577ec77ec6f3a3
parent4713f8b2c4f2c74239d284adcf1e59e61aa66576 (diff)
downloadopenembedded-core-contrib-1a7b843d575b290917d1e379c2ba106460988230.tar.gz
openembedded-core-contrib-1a7b843d575b290917d1e379c2ba106460988230.tar.bz2
openembedded-core-contrib-1a7b843d575b290917d1e379c2ba106460988230.zip
gettext.bbclass: do not add virtual/gettext to DEPENDS
gettext has a notoriously slow configuration step, and so in my testing this greatly speeds up building core-image-minimal: from 21m36s to 19m2s (empty sstate and tmp, but pre-populated downloads). I have also built world, and core-image-sato to make sure it doesn't break or modify the build, and there is no difference whatsoever in packages and images content. Target gettext seems not to be used for anything. Also fix up insane.bbclass to remove the corresponding QA check. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
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: