From b640604a02149e5953a304062067d043d3f5cde9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 3 Sep 2012 22:16:23 -0700 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-eglibc.inc | 1 + meta/conf/distro/include/tclibc-uclibc.inc | 2 ++ 2 files changed, 3 insertions(+) (limited to 'meta') 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" -- cgit v1.2.3-54-g00ecf