diff options
Diffstat (limited to 'meta/conf/distro/include/tclibc-glibc.inc')
| -rw-r--r-- | meta/conf/distro/include/tclibc-glibc.inc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index ad8000f5de..f48d16939e 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -4,9 +4,7 @@ LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}" -# Add glibc overrides to the overrides for glibc. LIBCOVERRIDE = ":libc-glibc" -OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" @@ -15,26 +13,18 @@ PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-glibc" PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale" +PREFERRED_PROVIDER_virtual/crypt ?= "libxcrypt" CXXFLAGS += "-fvisibility-inlines-hidden" -LIBC_DEPENDENCIES = "libsegfault \ +LIBC_DEPENDENCIES = "\ glibc \ glibc-dbg \ 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 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() : - 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" |