diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-11-30 19:07:07 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 16:54:07 +0000 |
commit | bf45449f1aeb98498c0194dbf60ed98af3feca75 (patch) | |
tree | 8a41d0660244bcbc123b3907456f3f3020b18413 /meta/conf | |
parent | f9e56d0ba42ebaee70fec01e48dda1cb040d9090 (diff) | |
download | poky-bf45449f1aeb98498c0194dbf60ed98af3feca75.tar.gz |
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 <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/tclibc-eglibc.inc | 3 | ||||
-rw-r--r-- | meta/conf/distro/include/tclibc-uclibc.inc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 8ef3cebb9a..8b8a214132 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc | |||
@@ -5,7 +5,8 @@ | |||
5 | LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" | 5 | LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" |
6 | 6 | ||
7 | # Add glibc overrides to the overrides for eglibc. | 7 | # Add glibc overrides to the overrides for eglibc. |
8 | OVERRIDES .= ":libc-glibc" | 8 | LIBCOVERRIDE = ":libc-glibc" |
9 | OVERRIDES .= "${LIBCOVERRIDE}" | ||
9 | 10 | ||
10 | PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" | 11 | PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" |
11 | PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" | 12 | 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 e0f50a0567..3984235d94 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc | |||
@@ -5,7 +5,8 @@ | |||
5 | LIBCEXTENSION = "-uclibc" | 5 | LIBCEXTENSION = "-uclibc" |
6 | 6 | ||
7 | # Add uclibc overrides to the overrides. | 7 | # Add uclibc overrides to the overrides. |
8 | OVERRIDES =. "libc-uclibc:" | 8 | LIBCOVERRIDE = ":libc-uclibc" |
9 | OVERRIDES .= "${LIBCOVERRIDE}" | ||
9 | 10 | ||
10 | PREFERRED_PROVIDER_virtual/libc = "uclibc" | 11 | PREFERRED_PROVIDER_virtual/libc = "uclibc" |
11 | PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" | 12 | PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" |