From 24b1fe929b5a22e3ad3a725bff916c2febea207a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Aug 2013 17:13:14 +0000 Subject: gettext: Improve USE_NLS handling for nativesdk/crosssdk/cross-canadian The gettext handling of USE_NLS has become a bit tricky to understand, or alter from the SDK context. This patch introduces a SDKUSE_NLS which can be set to configure a given SDK/ADT to use NLS or not. This is independent of the target system NLS usage. The code in gettext.bbclass is therefore simplified and the classes themselves now set USE_NLS to appropriate values. No NLS is used for native, cross and crosssdk since it is never used there and would just increase build time. (From OE-Core rev: fe634d47449899f7424adb77ff5bc7ddf8a07a47) Signed-off-by: Richard Purdie --- meta/classes/gettext.bbclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta/classes/gettext.bbclass') diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 17c894f74d..03b89b2455 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -1,17 +1,15 @@ def gettext_dependencies(d): - if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'): - return "" if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return "" - if oe.utils.inherits(d, 'native', 'cross'): + if d.getVar('USE_NLS', True) == 'no': return "gettext-minimal-native" return d.getVar('DEPENDS_GETTEXT', False) def gettext_oeconf(d): - if oe.utils.inherits(d, 'native', 'cross'): + if d.getVar('USE_NLS', True) == 'no': return '--disable-nls' # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set - if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): + if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return '--disable-nls' return "--enable-nls" -- cgit v1.2.3-54-g00ecf