From 6187466085b534abe03199b1a0ea127b97ab4201 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Sat, 10 Apr 2010 05:10:25 +0200
Subject: [PATCH] eglibc: - enable CHARSET option (iconv replacement) -
 cosmetics - install iconvdata and locale-bin

---
 packages/toolchain/devel/eglibc/build   | 8 ++++----
 packages/toolchain/devel/eglibc/install | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index 1b1315f75d..52c3477f78 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -38,16 +38,16 @@ libc_cv_gnu89_inline=yes
 libc_cv_ssp=no
 EOF
 
-# needed by glib: OPTION_EGLIBC_LOCALE_CODE = y
-# needed by PAM:  OPTION_EGLIBC_GETLOGIN = y
-# needed by PAM:  OPTION_EGLIBC_UTMP = y
+# needed by glib:       OPTION_EGLIBC_LOCALE_CODE = y
+# needed by PAM:        OPTION_EGLIBC_GETLOGIN = y
+# needed by PAM:        OPTION_EGLIBC_UTMP = y
+# libiconv replacement: OPTION_EGLIBC_CHARSETS = y
 
 cat >options-groups.conf <<EOF
 OPTION_EGLIBC_ADVANCED_INET6 = n
 OPTION_EGLIBC_BIG_MACROS = n
 OPTION_EGLIBC_BSD = n
 OPTION_EGLIBC_CATGETS = n
-OPTION_EGLIBC_CHARSETS = n
 OPTION_EGLIBC_DB_ALIASES = n
 OPTION_EGLIBC_LOCALES = n
 OPTION_EGLIBC_NIS = n
diff --git a/packages/toolchain/devel/eglibc/install b/packages/toolchain/devel/eglibc/install
index 9ed5095737..02b106ccf4 100755
--- a/packages/toolchain/devel/eglibc/install
+++ b/packages/toolchain/devel/eglibc/install
@@ -39,4 +39,12 @@ mkdir -p $INSTALL/bin
     sed -i 's%bash%sh%g' $INSTALL/bin/ldd
   fi
 
+  cp -P $PKG_BUILD/objdir-$1/locale/locale $INSTALL/bin
+
+  mkdir -p $INSTALL/usr/lib/gconv
+  cp -P $PKG_BUILD/iconvdata/gconv-modules $INSTALL/usr/lib/gconv
+  # didn't yet find a way to separate only needed modules.
+  # the way they are used is described within gconv-modules though
+  cp -P $PKG_BUILD/objdir-$1/iconvdata/*.so $INSTALL/usr/lib/gconv
+
 exit 0