summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-19 08:48:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-22 15:56:41 +0100
commit236bda9ed6e70d7159c9854e6e21386c2fca060a (patch)
tree588d95a4b88d01aab1910b6f4686e8a9f1ee0e4c
parent375835092c66090266f1206be76012d78708cd9f (diff)
downloadpoky-236bda9ed6e70d7159c9854e6e21386c2fca060a.tar.gz
poky-236bda9ed6e70d7159c9854e6e21386c2fca060a.tar.bz2
poky-236bda9ed6e70d7159c9854e6e21386c2fca060a.zip
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. (From OE-Core rev: 751ead4fa7d4120de906a1d9cb1d5a29357bebad) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/gettext.bbclass2
1 files changed, 1 insertions, 1 deletions
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)}"