[Devil-linux-commit] build/scripts util-linux,1.31,1.32

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

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

Modified Files:
	util-linux 
Log Message:
- updated util-linux to v2.12p
- updated loop-AES to v3.0b


Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- util-linux	28 Dec 2004 18:55:09 -0000	1.31
+++ util-linux	22 Jan 2005 21:27:07 -0000	1.32
@@ -26,14 +26,15 @@
 case $1 in
     build )
 		if [ ! -f util-linux-patch.done ]; then
-			echo "patch 2.4 "
+			echo "patch loop-AES "
 			patch -p1 -i $(find_src_dir loop-AES)/util-linux-2.12*.diff || exit 1
-			touch util-linux-patch.done
+			echo "other patches"
 			bzcat $DL_DIR/src/util-linux*.patch.bz2 | patch -p1 || exit 1
+			touch util-linux-patch.done
 		fi
 		
-		# (from LFS) GCC-3.4.1 miscompiles sfdisk if the default optimisation level is used. The following command prevents the problematic optimisation pass from being used.
-		sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile
+		## (from LFS) GCC-3.4.1 miscompiles sfdisk if the default optimisation level is used. The following command prevents the problematic optimisation pass from being used.
+		#sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile
 		
 		./configure || exit 1
 		replace_str defines.h "#define ENABLE_NLS" ""