diff options
| author | Khem Raj <raj.khem@gmail.com> | 2011-05-05 09:57:56 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-09 14:09:10 +0100 |
| commit | c08d4cfd41d1e936c41d03174e90eda806d8d7d3 (patch) | |
| tree | cf78a2f6249ad5b38e6d104c0007f39548306bb4 /meta/classes | |
| parent | c099dc0e83e3f3fc03059aaba59b4b4eb6c418be (diff) | |
| download | ast2050-yocto-poky-c08d4cfd41d1e936c41d03174e90eda806d8d7d3.zip ast2050-yocto-poky-c08d4cfd41d1e936c41d03174e90eda806d8d7d3.tar.gz | |
gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF instead of +=
Some recipes do not defined EXTRA_OECONF in such cases += drops
the --enable|--disable-nls options. In another case where recipe
defines EXTRA_OECONF instead of adding/appending to it then
--enable|--disable-nls options are lost from EXTRA_OECONF
We define EXTRA_OECONF = "" in bitbake.conf so the variable exists
always.
We use _append instead of += so the option is added at very end
and not lost.
We only return empty gettext dependencies if its a target recipe
in case when USE_NLS is not set because the native/cross/nativesdk recipes still
need the gettext dependencies
(From OE-Core rev: c47c783ddca8427aa7381e1df254a8d29ff0fe78)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/gettext.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 6f79e5e..86b505b 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -1,7 +1,7 @@ def gettext_dependencies(d): - if d.getVar('USE_NLS', True) == 'no': + if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'): return "" - if bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, True) and not oe.utils.inherits(d, 'cross-canadian'): + if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return "" return d.getVar('DEPENDS_GETTEXT', False) @@ -14,4 +14,4 @@ def gettext_oeconf(d): DEPENDS_GETTEXT = "virtual/gettext gettext-native" BASEDEPENDS =+ "${@gettext_dependencies(d)}" -EXTRA_OECONF += "${@gettext_oeconf(d)}" +EXTRA_OECONF_append = " ${@gettext_oeconf(d)}" |
