diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-04-10 18:33:46 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-11 12:12:24 +0100 |
| commit | bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2 (patch) | |
| tree | 7cd8e329344d9f1851700faca9877d0ec3089254 /meta | |
| parent | 546175abbac8a3c7ec4b5a4d014b05378bbb092f (diff) | |
| download | openembedded-core-bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2.tar.gz openembedded-core-bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2.tar.bz2 openembedded-core-bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2.tar.xz openembedded-core-bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2.zip | |
tclibc-eglibc.inc: make locale packages dependency conditional
Only add locale package dependencies if the eglibc is configured
with locale support.
This avoids dependencies issues for distros such as poky-tiny
[RP: Add PR bump]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/include/tclibc-eglibc.inc | 23 | ||||
| -rw-r--r-- | meta/recipes-core/tasks/task-core-standalone-sdk-target.bb | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 8b8a21413..aed82d187 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -23,10 +23,19 @@ LIBC_DEPENDENCIES = "libsegfault \ eglibc-dev \ eglibc-utils \ eglibc-thread-db \ - eglibc-localedata-i18n \ - eglibc-gconv-ibm850 \ - eglibc-gconv-cp1252 \ - eglibc-gconv-iso8859-1 \ - eglibc-gconv-iso8859-15 \ - locale-base-en-us \ - locale-base-en-gb " + ${@get_libc_locales_dependencies(d)}" + +LIBC_LOCALE_DEPENDENCIES = "\ + eglibc-localedata-i18n \ + eglibc-gconv-ibm850 \ + eglibc-gconv-cp1252 \ + eglibc-gconv-iso8859-1 \ + eglibc-gconv-iso8859-15 \ + locale-base-en-us \ + locale-base-en-gb" + +def get_libc_locales_dependencies(d): + if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() : + return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or '' + else: + return '' diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb index 3835ac7d6..03628a167 100644 --- a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb +++ b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Target packages for the standalone SDK" -PR = "r6" +PR = "r7" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |