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>

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 8b8a214132..aed82d1870 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 ''