toolchain modoifications

[hdw-linux/hdw-linux.git] / packages / base / glibc / glibc

diff --git a/packages/base/glibc/glibc b/packages/base/glibc/glibc
index 9f78d6a..95617f0 100644 (file)
--- a/packages/base/glibc/glibc
+++ b/packages/base/glibc/glibc
@@ -2,25 +2,35 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] cvs
+# [V] 2.3.6
 # [S] 2-3
-## [D] glibc-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
-# [D] glibc.tar.bz2 cvs:anoncvs:sources.redhat.com:cvs/glibc:libc
+# [D] glibc-2.3.6.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+# [D] glibc-linuxthreads-2.3.6.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
 
-srcdir=libc
+kernver=`grep '^#\ \[V\]' $confdir/../linux/linux | awk '{ print $3 }'`
+kernver=`echo $kernver | awk -F. '{ print $1 "." $2 }'`
 extraver="-${ver}"
 [ "$ver" = "cvs" ] && extraver=""
 
-confopt="$confopt --enable-add-ons=nptl --disable-profile --with-tls"
-confopt="$confopt --libexecdir=$root/tmp/pt_chown --without-cvs"
-confopt="$confopt --with-headers=/${s1_prefix}/glibc-kernheaders"
+confopt="$confopt --enable-add-ons --disable-profile"
+confopt="$confopt --libexecdir=$prefix/lib/glibc --without-cvs"
+confopt="$confopt --enable-kernel=$kernver"
 
 pre_install()  {
        echo "creating some files needed for build ..."
        mkdir -p $prefix/etc
        [ ! -f $root/etc/ld.so.conf ] && touch $root/etc/ld.so.conf
-       [ ! -c /dev/null ] && mknod -m 0666 /dev/null c 1 3
+       [ ! -c $root/dev/null ] && mknod -m 0666 $root/dev/null c 1 3
        echo "done (file creating)"
+
+       echo "patching ..."
+       sed 's/vi_VN.TCVN/d' localedata/SUPPORTED > tmp~
+       mv tmp~ localedata/SUPPORTED
+       echo "patching install test (warning, might not work for every arch)"
+       sed -e \
+        's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
+        scripts/test-installation.pl > tmp~
+       mv tmp~ scripts/test-installation.pl
                }
 
 build_main()   {
@@ -29,7 +39,7 @@ build_main()  {
        cd ../glibc-build
 
        # configure and prepare Makefile
-       ../${srcdir}${extraver}/configure $confopt
+       ../glibc${extraver}/configure $confopt
 
        # build and install
        make && make install && make localedata/install-locales