diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-13 17:57:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-14 09:11:58 +0000 |
| commit | 3c14bb4de21b7d7505d5e6e330d1876bd6f6c0df (patch) | |
| tree | 67971d3c4127b3f896f3bf326755a6417ee99f9e | |
| parent | 9a237153ec75080304be66c55b9dd92176be4a1c (diff) | |
| download | poky-3c14bb4de21b7d7505d5e6e330d1876bd6f6c0df.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.
(From OE-Core rev: c43c054cb778e0c5c082996cd6e6c45f5fc9e1bf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 | ||
