| Submitter | Khem Raj |
|---|---|
| Date | May 5, 2011, 4:57 p.m. |
| Message ID | <1304614676-7334-1-git-send-email-raj.khem@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/3263/ |
| State | New, archived |
| Headers | show |
Comments
On 05/05/2011 09:57 AM, Khem Raj wrote: > 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 > > Signed-off-by: Khem Raj<raj.khem@gmail.com> > --- > meta/classes/gettext.bbclass | 6 +++--- > meta/conf/bitbake.conf | 2 +- > 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 @@ > 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)}" > 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" > > export MAKE = "make" > EXTRA_OEMAKE = "-e MAKEFLAGS=" > - > +EXTRA_OECONF = "" > export LC_ALL = "C" > > ################################################################## Pulled into oe-core Thanks Sau!
Patch
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)}" 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" export MAKE = "make" EXTRA_OEMAKE = "-e MAKEFLAGS=" - +EXTRA_OECONF = "" export LC_ALL = "C" ##################################################################
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 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/classes/gettext.bbclass | 6 +++--- meta/conf/bitbake.conf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)