From cd80bcc9b8c53a907c4e04ea6e0984b736126b56 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 4 Feb 2014 19:23:20 -0800 Subject: [PATCH] angstrom-uclibc: Switch to using libiconv and gettext mini-iconv and proxy-libintl dont work with all kind of packages we use. Signed-off-by: Khem Raj --- conf/distro/include/angstrom-uclibc.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index a17e8c2..1e4ac47 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -4,12 +4,12 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" # The things uclibc can provide. We default to wanting uclibc to provide them. -PREFERRED_PROVIDER_virtual/libiconv = "mini-iconv" -PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" -PREFERRED_PROVIDER_virtual/gettext = "proxy-libintl" +PREFERRED_PROVIDER_virtual/libiconv = "libiconv" +PREFERRED_PROVIDER_virtual/libintl = "gettext" +PREFERRED_PROVIDER_virtual/gettext = "gettext" #fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" -PREFERRED_PROVIDER_virtual/gettext_avr32 = "proxy-libintl" +PREFERRED_PROVIDER_virtual/libintl_avr32 = "gettext" +PREFERRED_PROVIDER_virtual/gettext_avr32 = "gettext" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv-nativesdk = "nativesdk-eglibc"