From patchwork Fri Apr 20 16:45:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 33/43] gettext.bbclass: Ensure we don't overwrite other DEPENDS_GETTEXT values Date: Fri, 20 Apr 2012 16:45:24 -0000 From: Saul Wold X-Patchwork-Id: 26223 Message-Id: <5dad77ca5e77f4276871009a55b3c6e056071d5b.1334940120.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Richard Purdie 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 --- meta/classes/gettext.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 89faa30..95818c6 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)}"