sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Khem Raj 2011-05-05 09:57:56 -07:00 committed by Richard Purdie
parent c099dc0e83
commit c08d4cfd41
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/gettext.bbclass
View File

@ -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)}"

2
meta/conf/bitbake.conf
View File

@ -395,7 +395,7 @@ export BUILD_NM = "${BUILD_PREFIX}nm"
export MAKE = "make"
EXTRA_OEMAKE = "-e MAKEFLAGS="
EXTRA_OECONF = ""
export LC_ALL = "C"
##################################################################