[oe-commits] Khem Raj : tclibc-uclibc, tclibc-eglibc: Prefer nativesdk-eglibc to provide libintl

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 1e7797a0a8e8fd565d218bd7b9993e16f158764f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1e7797a0a8e8fd565d218bd7b9993e16f158764f

Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon Sep  3 22:16:23 2012 -0700

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 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/conf/distro/include/tclibc-eglibc.inc |    1 +
 meta/conf/distro/include/tclibc-uclibc.inc |    2 ++
 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 1c9e7e9..15f5ee5 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 3984235..9245112 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"