diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-22 18:51:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 13:09:11 +0100 |
commit | dc03e676999f8aa3640ffc73300fe02bbd46b49d (patch) | |
tree | c37abfc5ae98fcf8a995098947f504f1f3722c3f | |
parent | ac98301a56ae3795594e6ee7701cedd6e8f0fa77 (diff) | |
download | poky-dc03e676999f8aa3640ffc73300fe02bbd46b49d.tar.gz |
gettext: disable nls when INHIBIT_DEFAULT_DEPS is set
* for example in gcc-runtime DEPENDS_GETTEXT from gettext.bbclass isn't
used because gcc-runtime recipes also set INHIBIT_DEFAULT_DEPS,
explicitly disable NLS when DEPENDS_GETTEXT is empty
* this is causing undeterministic build
if you compare i586-oe-linux/libstdc++-v3/config.log in WORKDIR when building
gcc-runtime before and after building gettext-native you'll see that msgfmt
isn't found in one of them and gcc-runtime-locale-{de,fr} packages
aren't created, there is only one file in them:
gcc-runtime-locale-de/usr/share/locale/de/LC_MESSAGES/libstdc++.mo
(From OE-Core rev: 8f0b07fc53c94426efa3557424328b52a61e7305)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/gettext.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 95818c6771..17c894f74d 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass | |||
@@ -10,8 +10,8 @@ def gettext_dependencies(d): | |||
10 | def gettext_oeconf(d): | 10 | def gettext_oeconf(d): |
11 | if oe.utils.inherits(d, 'native', 'cross'): | 11 | if oe.utils.inherits(d, 'native', 'cross'): |
12 | return '--disable-nls' | 12 | return '--disable-nls' |
13 | # Remove the NLS bits if USE_NLS is no. | 13 | # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set |
14 | if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): | 14 | if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): |
15 | return '--disable-nls' | 15 | return '--disable-nls' |
16 | return "--enable-nls" | 16 | return "--enable-nls" |
17 | 17 | ||