summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-09-03 22:16:23 -0700
committerSaul Wold <sgw@linux.intel.com>2012-09-03 22:52:56 -0700
commit1e7797a0a8e8fd565d218bd7b9993e16f158764f (patch)
tree4222bdbab231ce0e290fa80a6298c56efe25cdf2 /meta/conf
parent46309e96300c35f6e8a5f33512a6a38720c629d2 (diff)
downloadopenembedded-core-1e7797a0a8e8fd565d218bd7b9993e16f158764f.tar.gz
openembedded-core-1e7797a0a8e8fd565d218bd7b9993e16f158764f.tar.bz2
openembedded-core-1e7797a0a8e8fd565d218bd7b9993e16f158764f.zip
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. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
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}"
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"
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}"
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"
USE_NLS ?= "no"