X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fbase%2Fglibc%2Fglibc;h=95617f0dfc87144ee81f24a366f919907b0e1fb8;hp=fd676f884e0d6afeeac3097bf0239d073e533ea7;hb=504579d0d381b02fc33fe1c696d64f96135a15a8;hpb=31a91ffcb50fe40bced2bc972f681e506863247a

diff --git a/packages/base/glibc/glibc b/packages/base/glibc/glibc
index fd676f8..95617f0 100644
--- a/packages/base/glibc/glibc
+++ b/packages/base/glibc/glibc
@@ -2,13 +2,13 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.3.5
+# [V] 2.3.6
 # [S] 2-3
-# [D] glibc-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
-# [D] glibc-linuxthreads-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+# [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=""
 
@@ -22,6 +22,15 @@ pre_install()	{
 	[ ! -f $root/etc/ld.so.conf ] && touch $root/etc/ld.so.conf
 	[ ! -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()	{
@@ -30,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