Patchwork [18/18] gettext: disable nls when INHIBIT_DEFAULT_DEPS is set

login
register
mail settings
Submitter Martin Jansa
Date July 24, 2013, 12:02 p.m.
Message ID <a2e681396ba1cffe5a215dc430010463cb377898.1374667312.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/54341/
State Accepted
Commit dc03e676999f8aa3640ffc73300fe02bbd46b49d
Headers show

Comments

Martin Jansa - July 24, 2013, 12:02 p.m.
* 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>
---
 meta/classes/gettext.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 95818c6..17c894f 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"