summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-09-03 22:16:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:53:10 +0100
commitb640604a02149e5953a304062067d043d3f5cde9 (patch)
tree084cbdf26ca09a8830e751d3f2bfd69432e7cb4d /meta/conf
parent0740f82aea92da0195524e37c372f9981e7f5e6d (diff)
downloadpoky-b640604a02149e5953a304062067d043d3f5cde9.tar.gz
tclibc-uclibc, tclibc-eglibc: Prefer nativesdk-eglibc to provide libintl
Currently gettext and eglibc compete to provide for libintl on nativesdk. So make choices to select eglibc nativesdk to provide for both eglibc as well as uclibc based systems. (From OE-Core rev: 1e7797a0a8e8fd565d218bd7b9993e16f158764f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc1
-rw-r--r--meta/conf/distro/include/tclibc-uclibc.inc2
2 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index 1c9e7e9de9..15f5ee5a30 100644
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -10,6 +10,7 @@ OVERRIDES .= "${LIBCOVERRIDE}"
10 10
11PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" 11PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
12PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" 12PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc"
13PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc"
13PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" 14PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
14PREFERRED_PROVIDER_virtual/libc ?= "eglibc" 15PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
15PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc" 16PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc"
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 3984235d94..9245112d10 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -11,6 +11,8 @@ OVERRIDES .= "${LIBCOVERRIDE}"
11PREFERRED_PROVIDER_virtual/libc = "uclibc" 11PREFERRED_PROVIDER_virtual/libc = "uclibc"
12PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" 12PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
13PREFERRED_PROVIDER_virtual/libintl ?= "gettext" 13PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
14PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc"
15PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc"
14 16
15USE_NLS ?= "no" 17USE_NLS ?= "no"
16 18