From ce3f296ec9021d207cb80cb2c697932b83fd0e81 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 28 Aug 2014 06:08:18 +0000 Subject: distro: TCLIBC now defines glibc instead of eglibc Adjust naming conventions to reflect eglibc->glibc move Signed-off-by: Khem Raj --- meta/conf/distro/defaultsetup.conf | 2 +- meta/conf/distro/include/security_flags.inc | 4 +-- meta/conf/distro/include/tclibc-eglibc.inc | 40 ----------------------------- meta/conf/distro/include/tclibc-glibc.inc | 40 +++++++++++++++++++++++++++++ meta/conf/distro/include/tclibc-musl.inc | 4 +-- meta/conf/distro/include/tclibc-uclibc.inc | 4 +-- meta/conf/distro/include/tcmode-default.inc | 18 ++++++------- 7 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 meta/conf/distro/include/tclibc-eglibc.inc create mode 100644 meta/conf/distro/include/tclibc-glibc.inc (limited to 'meta/conf') diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index 4437267ff3..71c65b1462 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -6,7 +6,7 @@ include conf/distro/include/world-broken.inc TCMODE ?= "default" require conf/distro/include/tcmode-${TCMODE}.inc -TCLIBC ?= "eglibc" +TCLIBC ?= "glibc" require conf/distro/include/tclibc-${TCLIBC}.inc # Allow single libc distros to disable this code diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index fa604fd5a4..60156c0514 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -23,8 +23,8 @@ SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CLAGS}" SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie" SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-eglibc = "" -SECURITY_CFLAGS_pn-eglibc-initial = "" +SECURITY_CFLAGS_pn-glibc = "" +SECURITY_CFLAGS_pn-glibc-initial = "" SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc deleted file mode 100644 index 15f5ee5a30..0000000000 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ /dev/null @@ -1,40 +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}" - -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/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc new file mode 100644 index 0000000000..649918fd2b --- /dev/null +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -0,0 +1,40 @@ +# +# glibc specific configuration +# + +LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) 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" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +LIBC_DEPENDENCIES = "libsegfault \ + 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', True) or '').split() : + return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or '' + else: + return '' diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc index d375d8d31d..d1272a39a0 100644 --- a/meta/conf/distro/include/tclibc-musl.inc +++ b/meta/conf/distro/include/tclibc-musl.inc @@ -11,8 +11,8 @@ OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libc ?= "musl" PREFERRED_PROVIDER_virtual/libiconv ?= "musl" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" USE_NLS ?= "no" diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index a4d8c3920d..14c3cdbb8a 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -11,8 +11,8 @@ OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libc ?= "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" USE_NLS ?= "no" diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 74e8f43851..6c0f102ed4 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -25,7 +25,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.9%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.24" -EGLIBCVERSION ?= "2.19" +GLIBCVERSION ?= "2.20" UCLIBCVERSION ?= "0.9.33+git%" LINUXLIBCVERSION ?= "3.16" @@ -47,14 +47,14 @@ PREFERRED_VERSION_binutils-crosssdk-${SDK_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" -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_VERSION_glibc ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" +PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" +PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" +PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" PREFERRED_VERSION_elfutils ?= "0.148" -- cgit v1.2.3