From bf45449f1aeb98498c0194dbf60ed98af3feca75 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 30 Nov 2011 19:07:07 -0800 Subject: classes, conf: Exclude native and nativesdk recipes from libc specific override Based on suggestions from RP libc-uclibc and libc-glibc overrides are for denoting system C library in use on the target and not for the host therefore we make sure that the override only takes effect for target recipes only. (From OE-Core rev: 6e2b53f47da0e97271fb51b281d24da1e1d549cc) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-eglibc.inc | 3 ++- meta/conf/distro/include/tclibc-uclibc.inc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/conf/distro') diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 8ef3ceb..8b8a214 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -5,7 +5,8 @@ LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" # Add glibc overrides to the overrides for eglibc. -OVERRIDES .= ":libc-glibc" +LIBCOVERRIDE = ":libc-glibc" +OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index e0f50a0..3984235 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -5,7 +5,8 @@ LIBCEXTENSION = "-uclibc" # Add uclibc overrides to the overrides. -OVERRIDES =. "libc-uclibc:" +LIBCOVERRIDE = ":libc-uclibc" +OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -- cgit v1.1