diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/cross-canadian.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/gettext.bbclass | 4 |
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} \ | |||
123 | -Wl,-rpath-link,${STAGING_LIBDIR}/.. \ | 123 | -Wl,-rpath-link,${STAGING_LIBDIR}/.. \ |
124 | -Wl,-rpath,${libdir}/.. " | 124 | -Wl,-rpath,${libdir}/.. " |
125 | 125 | ||
126 | DEPENDS_GETTEXT = "gettext-native nativesdk-gettext" | ||
127 | |||
128 | # | 126 | # |
129 | # We need chrpath >= 0.14 to ensure we can deal with 32 and 64 bit | 127 | # We need chrpath >= 0.14 to ensure we can deal with 32 and 64 bit |
130 | # binaries | 128 | # 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): | |||
3 | return "" | 3 | return "" |
4 | if d.getVar('USE_NLS') == 'no': | 4 | if d.getVar('USE_NLS') == 'no': |
5 | return "gettext-minimal-native" | 5 | return "gettext-minimal-native" |
6 | return d.getVar('DEPENDS_GETTEXT', False) | 6 | return "gettext-native" |
7 | 7 | ||
8 | def gettext_oeconf(d): | 8 | def gettext_oeconf(d): |
9 | if d.getVar('USE_NLS') == 'no': | 9 | if d.getVar('USE_NLS') == 'no': |
@@ -13,8 +13,6 @@ def gettext_oeconf(d): | |||
13 | return '--disable-nls' | 13 | return '--disable-nls' |
14 | return "--enable-nls" | 14 | return "--enable-nls" |
15 | 15 | ||
16 | DEPENDS_GETTEXT ??= "gettext-native" | ||
17 | |||
18 | BASEDEPENDS_append = " ${@gettext_dependencies(d)}" | 16 | BASEDEPENDS_append = " ${@gettext_dependencies(d)}" |
19 | EXTRA_OECONF_append = " ${@gettext_oeconf(d)}" | 17 | EXTRA_OECONF_append = " ${@gettext_oeconf(d)}" |
20 | 18 | ||