summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/include/tclibc-glibc.inc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-26 18:27:04 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-28 13:20:21 +0000
commitc62b1cc06613a4cdddf53290e6203559f43fc62d (patch)
tree090e5077e2023d574b227df577cf5ddb71132483 /meta/conf/distro/include/tclibc-glibc.inc
parentcc80e72be47d8d0ddb1950f1d206eced835231cf (diff)
downloadopenembedded-core-contrib-c62b1cc06613a4cdddf53290e6203559f43fc62d.tar.gz
default-distrovars: Drop DISTRO_FEATURES_LIBC
After eglibc was merged into glibc, Kconfig support was also dropped so these libc features therefore are not effective anymore and can be removed Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include/tclibc-glibc.inc')
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc19
1 files changed, 5 insertions, 14 deletions
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index abe619aaac..3246490997 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -22,17 +22,8 @@ LIBC_DEPENDENCIES = "libsegfault \
glibc-dev \
glibc-utils \
glibc-thread-db \
- ${@get_libc_locales_dependencies(d)}"
-
-LIBC_LOCALE_DEPENDENCIES = "\
- glibc-localedata-i18n \
- glibc-gconv-ibm850 \
- glibc-gconv-cp1252 \
- glibc-gconv-iso8859-1 \
- glibc-gconv-iso8859-15"
-
-def get_libc_locales_dependencies(d):
- if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d):
- return d.getVar('LIBC_LOCALE_DEPENDENCIES') or ''
- else:
- return ''
+ glibc-localedata-i18n \
+ glibc-gconv-ibm850 \
+ glibc-gconv-cp1252 \
+ glibc-gconv-iso8859-1 \
+ glibc-gconv-iso8859-15"