Patchwork [2/2] gettext.bbclass: Fix cases where we lost DEPENDS_GETTEXT

login
register
mail settings
Submitter Tom Rini
Date March 22, 2011, 6:21 p.m.
Message ID <3f44e1b84aa48bcf4c9a92639b0146ebecc90538.1300817337.git.tom_rini@mentor.com>
Download mbox | patch
Permalink /patch/1697/
State New, archived
Headers show

Comments

Tom Rini - March 22, 2011, 6:21 p.m.
This is a partial sync-up with 2a9a834ce426f4dc97162870ef1632540ff044f1
of openembedded master.  After consulting with Khem there's a few things
that we can do to further improve the situation but doing this fixes
the cases such as BBCLASSEXTEND where we can loose DEPENDS_GETTEXT
and trigger the QA error about missing inherit gettext (when we aren't).

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/classes/gettext.bbclass |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
Khem Raj - March 22, 2011, 6:33 p.m.
On (22/03/11 11:21), Tom Rini wrote:
> This is a partial sync-up with 2a9a834ce426f4dc97162870ef1632540ff044f1
> of openembedded master.  After consulting with Khem there's a few things
> that we can do to further improve the situation but doing this fixes
> the cases such as BBCLASSEXTEND where we can loose DEPENDS_GETTEXT
> and trigger the QA error about missing inherit gettext (when we aren't).
> 
> Signed-off-by: Tom Rini <tom_rini@mentor.com>

I think this one needs testing patch looks ok though

> ---
>  meta/classes/gettext.bbclass |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
> index a40e74f..45e883f 100644
> --- a/meta/classes/gettext.bbclass
> +++ b/meta/classes/gettext.bbclass
> @@ -4,7 +4,7 @@ def gettext_after_parse(d):
>          cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
>          cfg += " --disable-nls"
>          depends = bb.data.getVar('DEPENDS', d, 1) or ""
> -        bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
> +        bb.data.setVar('DEPENDS', oe_filter_out('^(gettext|gettext-native|virtual/libiconv|virtual/libintl)$', depends, d), d)
>          bb.data.setVar('EXTRA_OECONF', cfg, d)
>  
>  python () {
> @@ -13,5 +13,9 @@ python () {
>  
>  DEPENDS_GETTEXT = "gettext gettext-native"
>  
> -DEPENDS =+ "${DEPENDS_GETTEXT}"
> +DEPENDS_prepend += "${DEPENDS_GETTEXT} "
> +DEPENDS_virtclass-native_prepend = "${DEPENDS_GETTEXT} "
> +DEPENDS_virtclass-nativesdk_prepend = "${DEPENDS_GETTEXT} "
> +DEPENDS_virtclass-cross_prepend = "${DEPENDS_GETTEXT} "
> +DEPENDS_virtclass-crosssdk_prepend = "${DEPENDS_GETTEXT} "
>  EXTRA_OECONF += "--enable-nls"
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index a40e74f..45e883f 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -4,7 +4,7 @@  def gettext_after_parse(d):
         cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
         cfg += " --disable-nls"
         depends = bb.data.getVar('DEPENDS', d, 1) or ""
-        bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
+        bb.data.setVar('DEPENDS', oe_filter_out('^(gettext|gettext-native|virtual/libiconv|virtual/libintl)$', depends, d), d)
         bb.data.setVar('EXTRA_OECONF', cfg, d)
 
 python () {
@@ -13,5 +13,9 @@  python () {
 
 DEPENDS_GETTEXT = "gettext gettext-native"
 
-DEPENDS =+ "${DEPENDS_GETTEXT}"
+DEPENDS_prepend += "${DEPENDS_GETTEXT} "
+DEPENDS_virtclass-native_prepend = "${DEPENDS_GETTEXT} "
+DEPENDS_virtclass-nativesdk_prepend = "${DEPENDS_GETTEXT} "
+DEPENDS_virtclass-cross_prepend = "${DEPENDS_GETTEXT} "
+DEPENDS_virtclass-crosssdk_prepend = "${DEPENDS_GETTEXT} "
 EXTRA_OECONF += "--enable-nls"