diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-02-26 18:27:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-28 13:21:54 +0000 |
commit | 9d973d3b4ed8d2ce3c8997dc21603a0952e7ef0e (patch) | |
tree | d82567893852c0134a574f1c45ce7db7b90c2fd0 /meta/conf/distro/include/tclibc-glibc.inc | |
parent | 561ff52c516990c769681446c22d516eb6b91461 (diff) | |
download | poky-9d973d3b4ed8d2ce3c8997dc21603a0952e7ef0e.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
(From OE-Core rev: c62b1cc06613a4cdddf53290e6203559f43fc62d)
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.inc | 19 |
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 \ | |||
22 | glibc-dev \ | 22 | glibc-dev \ |
23 | glibc-utils \ | 23 | glibc-utils \ |
24 | glibc-thread-db \ | 24 | glibc-thread-db \ |
25 | ${@get_libc_locales_dependencies(d)}" | 25 | glibc-localedata-i18n \ |
26 | 26 | glibc-gconv-ibm850 \ | |
27 | LIBC_LOCALE_DEPENDENCIES = "\ | 27 | glibc-gconv-cp1252 \ |
28 | glibc-localedata-i18n \ | 28 | glibc-gconv-iso8859-1 \ |
29 | glibc-gconv-ibm850 \ | 29 | glibc-gconv-iso8859-15" |
30 | glibc-gconv-cp1252 \ | ||
31 | glibc-gconv-iso8859-1 \ | ||
32 | glibc-gconv-iso8859-15" | ||
33 | |||
34 | def get_libc_locales_dependencies(d): | ||
35 | if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d): | ||
36 | return d.getVar('LIBC_LOCALE_DEPENDENCIES') or '' | ||
37 | else: | ||
38 | return '' | ||