[Devil-linux-commit] build/scripts util-linux,1.36,1.37

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

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

Modified Files:
	util-linux 
Log Message:
updated util-linux


Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- util-linux	27 Dec 2005 11:04:33 -0000	1.36
+++ util-linux	21 Mar 2007 01:51:14 -0000	1.37
@@ -27,17 +27,16 @@
     build )
 	if [ ! -f util-linux-patch.done ]; then
 		echo "patch loop-AES "
-		patch -p1 -i $(find_src_dir loop-AES)/util-linux-2.12*.diff || exit 1
+		patch -p1 -i $(find_src_dir loop-AES)/util-linux-2.13*.diff || exit 1
 		echo "other patches"
-		bzcat $DL_DIR/src/util-linux*.patch.bz2 | patch -p1 || exit 1
+		#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" ""
 
 	cd lib || exit 1 
 	make all || exit 1
@@ -52,17 +51,21 @@
 	make clean
 	cd .. || exit 1
 		
-	make $PMAKE HAVE_PAM=yes HAVE_SLN=yes HAVE_KILL=yes ADD_RAW=yes DISABLE_NLS=yes LDFLAGS="-pie" || exit 1
+	make $PMAKE LDFLAGS="-pie" || exit 1
 	strip_debug
 
 	# we need some of the tools later, so let's install it
-	make HAVE_SLN=yes HAVE_KILL=yes ADD_RAW=yes DISABLE_NLS=yes install || exit 1
+	make install || exit 1
 	;;
 
     install )
 	rm -rf $TMPDIR || exit 1
 	mkdir -p $TMPDIR || exit 1
-	make HAVE_SLN=yes HAVE_KILL=yes ADD_RAW=yes DISABLE_NLS=yes DESTDIR=$TMPDIR install || exit 1
+	make DESTDIR=$TMPDIR install || exit 1
+
+    echo "we need to fix this for the new 2.13 version"
+    exit 1
+
 	copy_docs $TMPDIR
 	rm -rf $TMPDIR/usr/share || exit 1
 	cp -dpR $TMPDIR/etc $ETCDIR/ || exit 1