From c43c054cb778e0c5c082996cd6e6c45f5fc9e1bf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 13 Jan 2018 17:57:24 +0000 Subject: cross-canadian/gettext: Drop unneeded nativesdk-gettext dependency In line with the other gettext cleanups, drop the nativesdk-gettext dependency as it isn't needed (similarly to the previous target gettext dependencies). This then means we can drop DEPENDS_GETTEXT as there are no other users. Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 2 -- meta/classes/gettext.bbclass | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index cce09c93da..ee8aa6142a 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -123,8 +123,6 @@ LDFLAGS = "${BUILDSDK_LDFLAGS} \ -Wl,-rpath-link,${STAGING_LIBDIR}/.. \ -Wl,-rpath,${libdir}/.. " -DEPENDS_GETTEXT = "gettext-native nativesdk-gettext" - # # We need chrpath >= 0.14 to ensure we can deal with 32 and 64 bit # binaries diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index da68e63242..be2ef3b311 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -3,7 +3,7 @@ def gettext_dependencies(d): return "" if d.getVar('USE_NLS') == 'no': return "gettext-minimal-native" - return d.getVar('DEPENDS_GETTEXT', False) + return "gettext-native" def gettext_oeconf(d): if d.getVar('USE_NLS') == 'no': @@ -13,8 +13,6 @@ def gettext_oeconf(d): return '--disable-nls' return "--enable-nls" -DEPENDS_GETTEXT ??= "gettext-native" - BASEDEPENDS_append = " ${@gettext_dependencies(d)}" EXTRA_OECONF_append = " ${@gettext_oeconf(d)}" -- cgit 1.2.3-korg