From 3790305f90be4c6c69c0ab816dc9db868ab4bab2 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 10 Feb 2011 14:02:19 +0100
Subject: [PATCH] eglibc: rework buildscript, now it uses our config again,
 adapt the config for our needs

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/toolchain/devel/eglibc/build   | 72 ++++++++++++++-----------
 packages/toolchain/devel/eglibc/install |  9 ++--
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index bd7dd593ed..1d656fcfff 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -38,8 +38,7 @@ if [ "$DEBUG" = yes ]; then
   DEBUG_CONFIG="--enable-debug"
 else
   DEBUG_CONFIG="--disable-debug"
-  DEBUG_OPTIONS="OPTION_EGLIBC_BACKTRACE = n
-                 OPTION_EGLIBC_MEMUSAGE = n"
+  DEBUG_OPTIONS="  OPTION_EGLIBC_MEMUSAGE = n"
 fi
 
 NSS_CONF_DIR=`ls -d $ROOT/$BUILD/eglibc*/nss`
@@ -50,6 +49,46 @@ autoconf
 
 mkdir -p objdir-$1 && cd objdir-$1
 
+# OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = $NSS_CONF_DIR/fixed-nsswitch.conf
+# OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = $NSS_CONF_DIR/fixed-nsswitch.functions
+
+cat >option-groups.config <<EOF
+
+  OPTION_EGLIBC_ADVANCED_INET6 = n
+
+# needed for connman:
+  OPTION_EGLIBC_BACKTRACE = y
+
+  OPTION_EGLIBC_BIG_MACROS = n
+  OPTION_EGLIBC_BSD = n
+  OPTION_EGLIBC_CATGETS = n
+
+# libiconv replacement:
+  OPTION_EGLIBC_CHARSETS = n
+
+  OPTION_EGLIBC_DB_ALIASES = n
+  OPTION_EGLIBC_LOCALES = n
+
+# needed for example with glib and Python:
+  OPTION_EGLIBC_LOCALE_CODE = y
+
+  OPTION_EGLIBC_NIS = y
+  OPTION_EGLIBC_NSSWITCH = y
+  OPTION_EGLIBC_RCMD = n
+
+# needed by eglibc byself (todo):
+  OPTION_EGLIBC_RTLD_DEBUG = y
+
+  OPTION_POSIX_REGEXP_GLIBC = n
+
+# needed for PAM:
+  OPTION_EGLIBC_GETLOGIN = n
+  OPTION_EGLIBC_UTMP = n
+
+  OPTION_EGLIBC_UTMPX = n
+  $DEBUG_OPTIONS
+EOF
+
 cat >config.cache <<EOF
 libc_cv_forced_unwind=yes
 libc_cv_c_cleanup=yes
@@ -57,33 +96,6 @@ 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
-# libiconv replacement: OPTION_EGLIBC_CHARSETS = y
-# OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = $NSS_CONF_DIR/fixed-nsswitch.conf
-# OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = $NSS_CONF_DIR/fixed-nsswitch.functions
-
-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_DB_ALIASES = n
-OPTION_EGLIBC_LOCALES = n
-OPTION_EGLIBC_NIS = n
-OPTION_EGLIBC_NSSWITCH = y
-OPTION_EGLIBC_RCMD = n
-OPTION_EGLIBC_RTLD_DEBUG = n
-OPTION_POSIX_REGEXP_GLIBC = n
-
-OPTION_EGLIBC_GETLOGIN = n
-OPTION_EGLIBC_UTMP = n
-OPTION_EGLIBC_UTMPX = n
-
-$DEBUG_OPTIONS
-EOF
-
 cat >configparms <<EOF
 slibdir=/lib
 EOF
@@ -98,7 +110,7 @@ EOF
              --enable-bind-now \
              --with-elf \
              --with-tls \
-             --enable-kernel=2.6.36 \
+             --enable-kernel=2.6.37 \
              --with-__thread \
              --with-binutils=$BUILD/toolchain/bin \
              --with-headers=$SYSROOT_PREFIX/usr/include \
diff --git a/packages/toolchain/devel/eglibc/install b/packages/toolchain/devel/eglibc/install
index 1c047b5b96..0f7a745cdf 100755
--- a/packages/toolchain/devel/eglibc/install
+++ b/packages/toolchain/devel/eglibc/install
@@ -28,7 +28,7 @@ mkdir -p $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/dlfcn/libdl.so.2 $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/nptl/libpthread.so.0 $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/math/libm.so.6 $INSTALL/lib
-  cp $PKG_BUILD/objdir-$1/login/libutil.so.1 $INSTALL/lib # e.g. for utmp support, needed by PAM_filter
+#  cp $PKG_BUILD/objdir-$1/login/libutil.so.1 $INSTALL/lib # e.g. for utmp support, needed by PAM_filter
   cp $PKG_BUILD/objdir-$1/rt/librt.so.1 $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/resolv/libnss_dns.so.2 $INSTALL/lib
   cp $PKG_BUILD/objdir-$1/nis/libnsl.so.1 $INSTALL/lib
@@ -45,11 +45,12 @@ mkdir -p $INSTALL/bin
 
   cp $PKG_BUILD/objdir-$1/locale/locale $INSTALL/bin
 
-  mkdir -p $INSTALL/usr/lib/gconv
-    cp $PKG_BUILD/iconvdata/gconv-modules $INSTALL/usr/lib/gconv
+# libiconv replacement:
+#  mkdir -p $INSTALL/usr/lib/gconv
+#    cp $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 $PKG_BUILD/objdir-$1/iconvdata/*.so $INSTALL/usr/lib/gconv
+#    cp $PKG_BUILD/objdir-$1/iconvdata/*.so $INSTALL/usr/lib/gconv
 
 mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc