From 52bce08568ffbd5d444a7200f549e3370e2fd374 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 11 Nov 2014 15:08:36 +0100 Subject: external-linaro-toolchain: eglibc -> glibc OE-core moved to glibc, make external toolchain follow that. Even if the external toolchain is using eglibc we need to specify glibc to get the build going. This is caused by the way OE-core handles virtual/libc. Change-Id: I4f1cf621901ef3885bc1bfcba61903e6818433ca Signed-off-by: Koen Kooi --- .../conf/distro/include/tcmode-external-linaro.inc | 2 +- .../external-linaro-toolchain.bb | 26 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc index 1d9fd59c..19be8af2 100644 --- a/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc +++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc @@ -23,7 +23,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-linaro-toolchain" -PREFERRED_PROVIDER_eglibc = "external-linaro-toolchain" +PREFERRED_PROVIDER_glibc = "external-linaro-toolchain" PREFERRED_PROVIDER_libgcc = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/libc = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/libintl = "external-linaro-toolchain" diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index 06abb7af..2718e057 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -1,4 +1,4 @@ -require recipes-core/eglibc/eglibc-package.inc +require recipes-core/glibc/glibc-package.inc INHIBIT_DEFAULT_DEPS = "1" INHIBIT_PACKAGE_STRIP = "1" @@ -23,7 +23,7 @@ PROVIDES += "\ virtual/libintl \ virtual/libiconv \ glibc-thread-db \ - eglibc \ + glibc \ libgcc \ libg2c \ libg2c-dev \ @@ -152,17 +152,17 @@ INSANE_SKIP_libstdc++ += "ldflags" INSANE_SKIP_libgcc += "ldflags" INSANE_SKIP_gdbserver += "ldflags" -PKG_${PN} = "eglibc" -PKG_${PN}-dev = "eglibc-dev" -PKG_${PN}-doc = "eglibc-doc" -PKG_${PN}-dbg = "eglibc-dbg" -PKG_${PN}-pic = "eglibc-pic" -PKG_${PN}-utils = "eglibc-utils" -PKG_${PN}-gconv = "eglibc-gconv" -PKG_${PN}-extra-nss = "eglibc-extra-nss" -PKG_${PN}-thread-db = "eglibc-thread-db" -PKG_${PN}-pcprofile = "eglibc-pcprofile" -PKG_${PN}-staticdev = "eglibc-staticdev" +PKG_${PN} = "glibc" +PKG_${PN}-dev = "glibc-dev" +PKG_${PN}-doc = "glibc-doc" +PKG_${PN}-dbg = "glibc-dbg" +PKG_${PN}-pic = "glibc-pic" +PKG_${PN}-utils = "glibc-utils" +PKG_${PN}-gconv = "glibc-gconv" +PKG_${PN}-extra-nss = "glibc-extra-nss" +PKG_${PN}-thread-db = "glibc-thread-db" +PKG_${PN}-pcprofile = "glibc-pcprofile" +PKG_${PN}-staticdev = "glibc-staticdev" PKGV_${PN} = "${ELT_VER_LIBC}" PKGV_${PN}-dev = "${ELT_VER_LIBC}" -- cgit v1.2.3