diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2014-12-03 10:07:46 +0100 |
|---|---|---|
| committer | Koen Kooi <koen.kooi@linaro.org> | 2014-12-03 10:09:15 +0100 |
| commit | 3589ab47de5782a91eac491f6885f9c4bee40e0c (patch) | |
| tree | 33ee0a3e119cbfa906a474dab0f16163d500b932 /meta-linaro-integration | |
| parent | 8e3d2af3c2b436cd99eb3b9f88915269161e86c8 (diff) | |
meta-linaro-integration: finish eglibc->glibc move
Change-Id: I951f8a1592425a83748f104a7af3b775db802020
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Diffstat (limited to 'meta-linaro-integration')
| -rw-r--r-- | meta-linaro-integration/conf/distro/include/tclibc-eglibc.inc | 50 | ||||
| -rw-r--r-- | meta-linaro-integration/conf/layer.conf | 2 |
2 files changed, 1 insertions, 51 deletions
diff --git a/meta-linaro-integration/conf/distro/include/tclibc-eglibc.inc b/meta-linaro-integration/conf/distro/include/tclibc-eglibc.inc deleted file mode 100644 index 307005e6..00000000 --- a/meta-linaro-integration/conf/distro/include/tclibc-eglibc.inc +++ /dev/null @@ -1,50 +0,0 @@ -# -# eglibc specific configuration -# - -LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" - -# Add glibc overrides to the overrides for eglibc. -LIBCOVERRIDE = ":libc-glibc" -OVERRIDES .= "${LIBCOVERRIDE}" - -EGLIBCVERSION ?= "linar-2.19" -PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-mtrace ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-scripts ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_nativesdk-eglibc ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_cross-localedef-native ?= "${EGLIBCVERSION}" - -PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" -PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" -PREFERRED_PROVIDER_virtual/libc ?= "eglibc" -PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc" -PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -LIBC_DEPENDENCIES = "libsegfault \ - eglibc \ - eglibc-dbg \ - eglibc-dev \ - eglibc-utils \ - eglibc-thread-db \ - ${@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" - -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 '' diff --git a/meta-linaro-integration/conf/layer.conf b/meta-linaro-integration/conf/layer.conf index a9f43d87..edb8f29f 100644 --- a/meta-linaro-integration/conf/layer.conf +++ b/meta-linaro-integration/conf/layer.conf @@ -12,5 +12,5 @@ BBFILE_PRIORITY_linaro-integration = "30" BB_DANGLINGAPPENDS_WARNONLY = "true" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ - gcc-cross-${TARGET_ARCH}->eglibc \ + gcc-cross-${TARGET_ARCH}->glibc \ " |