aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-13 17:57:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-14 09:11:27 +0000
commitc43c054cb778e0c5c082996cd6e6c45f5fc9e1bf (patch)
tree5e1a6d4bb319eb8564660601b5823dd21763d978
parent4505c3282fdedd469325e24bd71edb3d2532a1ab (diff)
downloadopenembedded-core-contrib-c43c054cb778e0c5c082996cd6e6c45f5fc9e1bf.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cross-canadian.bbclass2
-rw-r--r--meta/classes/gettext.bbclass4
2 files changed, 1 insertions, 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)}"