From dc03e676999f8aa3640ffc73300fe02bbd46b49d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 22 Jul 2013 18:51:11 +0200 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/gettext.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/gettext.bbclass') 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" -- cgit v1.2.3-54-g00ecf