[Devil-linux-commit] build/scripts glibc,1.42,1.43

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17363/scripts

Modified Files:
	glibc 
Log Message:
glibc can now be installed even when it's not i686, we're getting somewhere
finally !


Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- glibc	24 Dec 2004 17:03:50 -0000	1.42
+++ glibc	24 Dec 2004 23:58:30 -0000	1.43
@@ -95,18 +95,20 @@
 		strip_debug || exit 1
 
 		# we have to install this immediately, because this is a library and could be needed by other sources
-		make install || exit 1
+		rm -rf $TMPDIR || exit 1
+		make install install_root=$TMPDIR || exit 1
+
+		# ok we need to do this a little tricky, otherwise all hell breaks loose
+		cd $TMPDIR || exit 1
+		tar -cf glibc.tar * || exit 1
+		tar -C / -xf glibc.tar || exit 1
+		cd .. || exit 1
+
+		rm -rf $TMPDIR || exit 1
 		#make localedata/install-locales || exit 1
                
-		# copy it manually, otherwise we fail with a segmentation fault
-		#rm -rf $TMPDIR || exit 1
-		#mkdir -p $TMPDIR/etc || exit 1
-		#make install install_root=$TMPDIR || exit 1
-		#cp -vfdpR $TMPDIR/* / || exit 1
-		#rm -rf $TMPDIR || exit 1
-		
 		;;
-
+		
 	install )
 		cd ../glibc-build || exit 1
 		rm -rf $TMPDIR || exit 1