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/conf | |
parent | c099dc0e83e3f3fc03059aaba59b4b4eb6c418be (diff) | |
download | 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/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index a2b36bdbef..4a1bfa168b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -395,7 +395,7 @@ export BUILD_NM = "${BUILD_PREFIX}nm" | |||
395 | 395 | ||
396 | export MAKE = "make" | 396 | export MAKE = "make" |
397 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | 397 | EXTRA_OEMAKE = "-e MAKEFLAGS=" |
398 | 398 | EXTRA_OECONF = "" | |
399 | export LC_ALL = "C" | 399 | export LC_ALL = "C" |
400 | 400 | ||
401 | ################################################################## | 401 | ################################################################## |