ublibc.inc, micro-uclibc.conf: Avoid gettext in uclibc systems.

Signed-off-by: Graham Gower <graham.gower@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>

diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc
index dd00647..200fac2 100644 (file)
--- a/conf/distro/include/uclibc.inc
+++ b/conf/distro/include/uclibc.inc
@@ -3,7 +3,7 @@ OVERRIDES =. "libc-uclibc:"
 
 # The things uclibc can provide.  We default to wanting uclibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
-PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+PREFERRED_PROVIDER_virtual/libintl ?= "proxy-libintl"
 #fix some iconv issues, needs to be adjusted when doing uclibc builds
 PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl"
 PREFERRED_PROVIDER_virtual/libc = "uclibc"

diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf
index fb1887c..85ea9b3 100644 (file)
--- a/conf/distro/micro-uclibc.conf
+++ b/conf/distro/micro-uclibc.conf
@@ -24,3 +24,5 @@ require conf/distro/micro.conf
 # Use overrides for micro as well
 OVERRIDES .= ":micro"
 
+# Don't let glib-2.0 pull in gettext
+USE_NLS_glib-2.0 = "no"