aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Gower <graham.gower@gmail.com>2010-12-24 10:39:30 +1030
committerGraham Gower <graham.gower@gmail.com>2010-12-24 16:42:37 +1030
commit55bfa043e94ecd0e28829284a66998c8233c4853 (patch)
tree49dc4bd200438858a5ba114884e2f5fe6bf270b3
parent6c7c4f7d53ce2c6df84e9fc10cede928ee327ea3 (diff)
downloadopenembedded-55bfa043e94ecd0e28829284a66998c8233c4853.tar.gz
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>
-rw-r--r--conf/distro/include/uclibc.inc2
-rw-r--r--conf/distro/micro-uclibc.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc
index dd00647921..200fac20c7 100644
--- 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 fb1887c96c..85ea9b3bf5 100644
--- 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"