aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/gettext.bbclass
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-07-22 18:51:11 +0200
committerSaul Wold <sgw@linux.intel.com>2013-07-27 23:28:27 -0700
commit8f0b07fc53c94426efa3557424328b52a61e7305 (patch)
tree37c61d35a4848f7495d9bb4eb09bf4999979534d /meta/classes/gettext.bbclass
parenteb3a2553ed3b627cb25001b552624690b4959069 (diff)
downloadopenembedded-core-contrib-8f0b07fc53c94426efa3557424328b52a61e7305.tar.gz
openembedded-core-contrib-8f0b07fc53c94426efa3557424328b52a61e7305.tar.bz2
openembedded-core-contrib-8f0b07fc53c94426efa3557424328b52a61e7305.zip
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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/gettext.bbclass')
-rw-r--r--meta/classes/gettext.bbclass4
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):
def gettext_oeconf(d):
if oe.utils.inherits(d, 'native', 'cross'):
return '--disable-nls'
- # Remove the NLS bits if USE_NLS is no.
- if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'):
+ # 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'):
return '--disable-nls'
return "--enable-nls"