[oe-commits] [openembedded-core] 03/06: gettext.bbclass: do not add virtual/gettext to DEPENDS

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 1a7b843d575b290917d1e379c2ba106460988230
Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
AuthorDate: Tue Aug 29 14:10:53 2017 +0300

    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 at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/gettext.bbclass | 2 +-
 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 689ef55..da68e63 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 fe0d744..3906ba7 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.