From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 19 Apr 2012 07:48:25 +0000 (+0100)
Subject: gettext.bbclass: Ensure we don't overwrite other DEPENDS_GETTEXT values
X-Git-Tag: 2015-4~10930
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=751ead4fa7d4120de906a1d9cb1d5a29357bebad;p=openembedded-core.git

gettext.bbclass: Ensure we don't overwrite other DEPENDS_GETTEXT values

In particular, this overwrites the value from cross-canadian.bbclass in
some cases which isn't the desired behaviour and unnecessarily
complicates/breaks the dependency chain.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 89faa30eca..95818c6771 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -15,7 +15,7 @@ def gettext_oeconf(d):
         return '--disable-nls'
     return "--enable-nls"
 
-DEPENDS_GETTEXT = "virtual/gettext gettext-native"
+DEPENDS_GETTEXT ??= "virtual/gettext gettext-native"
 
 BASEDEPENDS =+ "${@gettext_dependencies(d)}"
 EXTRA_OECONF_append = " ${@gettext_oeconf(d)}"