diff options
Diffstat (limited to 'meta/classes/gettext.bbclass')
| -rw-r--r-- | meta/classes/gettext.bbclass | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 89faa30eca..0be14246bf 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -1,21 +1,19 @@ def gettext_dependencies(d): - if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'): + if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): 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') == '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') == 'no': 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('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): return '--disable-nls' return "--enable-nls" -DEPENDS_GETTEXT = "virtual/gettext gettext-native" +DEPENDS_GETTEXT ??= "virtual/gettext gettext-native" BASEDEPENDS =+ "${@gettext_dependencies(d)}" EXTRA_OECONF_append = " ${@gettext_oeconf(d)}" |