summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-05-05 16:57:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-09 13:09:10 (GMT)
commitc08d4cfd41d1e936c41d03174e90eda806d8d7d3 (patch)
treecf78a2f6249ad5b38e6d104c0007f39548306bb4
parentc099dc0e83e3f3fc03059aaba59b4b4eb6c418be (diff)
downloadpoky-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>
-rw-r--r--meta/classes/gettext.bbclass6
-rw-r--r--meta/conf/bitbake.conf2
2 files changed, 4 insertions, 4 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 @@
1def gettext_dependencies(d): 1def gettext_dependencies(d):
2 if d.getVar('USE_NLS', True) == 'no': 2 if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'):
3 return "" 3 return ""
4 if bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, True) and not oe.utils.inherits(d, 'cross-canadian'): 4 if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'):
5 return "" 5 return ""
6 return d.getVar('DEPENDS_GETTEXT', False) 6 return d.getVar('DEPENDS_GETTEXT', False)
7 7
@@ -14,4 +14,4 @@ def gettext_oeconf(d):
14DEPENDS_GETTEXT = "virtual/gettext gettext-native" 14DEPENDS_GETTEXT = "virtual/gettext gettext-native"
15 15
16BASEDEPENDS =+ "${@gettext_dependencies(d)}" 16BASEDEPENDS =+ "${@gettext_dependencies(d)}"
17EXTRA_OECONF += "${@gettext_oeconf(d)}" 17EXTRA_OECONF_append = " ${@gettext_oeconf(d)}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a2b36bd..4a1bfa1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -395,7 +395,7 @@ export BUILD_NM = "${BUILD_PREFIX}nm"
395 395
396export MAKE = "make" 396export MAKE = "make"
397EXTRA_OEMAKE = "-e MAKEFLAGS=" 397EXTRA_OEMAKE = "-e MAKEFLAGS="
398 398EXTRA_OECONF = ""
399export LC_ALL = "C" 399export LC_ALL = "C"
400 400
401################################################################## 401##################################################################