[Devil-linux-commit] build/scripts gcc,1.28,1.29

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

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

Modified Files:
	gcc 
Log Message:
use correct ssp patch for the kernel


Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gcc	28 Dec 2004 18:55:08 -0000	1.28
+++ gcc	2 Jan 2005 20:12:46 -0000	1.29
@@ -29,6 +29,7 @@
 	build )
 		CONFIG_EXTRA=""
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+		    echo "applying SSP patches"
 		    PROTECTORDIR=$(find_src_dir protector)
 		    if [ ! -e ./.done_patch_protector ]; then
 			cd gcc
@@ -39,6 +40,7 @@
 			touch ./.done_patch_protector
 
 			if [ ! -f $KERNELDIR/devil-linux-kernel-protector-patch.done ]; then
+			    echo "applying SSP kernel patch"
 			    if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
 	    		    	bzcat $DL_DIR/src/linux-2.4.*-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
 			    else
@@ -53,9 +55,11 @@
 		fi
 
 		if [ ! -f gcc-patches.done ]; then
-			bzcat $DL_DIR/src/gcc-3*patch.bz2 | patch -p1 || exit 1
-			touch gcc-patches.done
+		    echo "applying gcc patches"
+		    bzcat $DL_DIR/src/gcc-3*patch.bz2 | patch -p1 || exit 1
+		    echo "applying auto-pue patch"
 		    patch -p1 -i $(find_src_dir gcc-secpatches)/gcc-3.4-piespecs_x86-2.patch || exit 1
+		    touch gcc-patches.done
 		fi
 
 		sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in