summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-04-11 01:33:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-11 11:12:43 (GMT)
commit88b399bb2c8adcf8563d144c0838cbcdd45c0694 (patch)
treef72f92b1d1a8bbd65be3a69bb183812efc1256d2 /meta/conf
parent6abc4c46fdf767d986a8c10283a7b08f4f8b58c9 (diff)
downloadpoky-88b399bb2c8adcf8563d144c0838cbcdd45c0694.tar.gz
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] (From OE-Core rev: bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc23
1 files changed, 16 insertions, 7 deletions
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index 8b8a214..aed82d1 100644
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -23,10 +23,19 @@ LIBC_DEPENDENCIES = "libsegfault \
23 eglibc-dev \ 23 eglibc-dev \
24 eglibc-utils \ 24 eglibc-utils \
25 eglibc-thread-db \ 25 eglibc-thread-db \
26 eglibc-localedata-i18n \ 26 ${@get_libc_locales_dependencies(d)}"
27 eglibc-gconv-ibm850 \ 27
28 eglibc-gconv-cp1252 \ 28LIBC_LOCALE_DEPENDENCIES = "\
29 eglibc-gconv-iso8859-1 \ 29 eglibc-localedata-i18n \
30 eglibc-gconv-iso8859-15 \ 30 eglibc-gconv-ibm850 \
31 locale-base-en-us \ 31 eglibc-gconv-cp1252 \
32 locale-base-en-gb " 32 eglibc-gconv-iso8859-1 \
33 eglibc-gconv-iso8859-15 \
34 locale-base-en-us \
35 locale-base-en-gb"
36
37def get_libc_locales_dependencies(d):
38 if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() :
39 return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or ''
40 else:
41 return ''