[Devil-linux-commit] build/scripts ipset,1.5,1.6

[Serge L. <sma...@us...>]

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

Modified Files:
	ipset 
Log Message:

- disable ssp 


Index: ipset
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipset,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ipset	1 May 2007 00:30:31 -0000	1.5
+++ ipset	22 Mar 2008 18:47:21 -0000	1.6
@@ -32,7 +32,11 @@
 
 		replace_str Makefile "/usr/local" "/usr"
 		# parallel build failes, do not use $PMAKE
-		make all COPT_FLAGS="$FLAGS" KERNEL_DIR=$KERNELDIR || exit 1
+		if [ "$CONFIG_GCC_HARDENED" = "y" ]; then
+		    make CC="gcc -fno-stack-protector" COPT_FLAGS="$FLAGS" KERNEL_DIR=$KERNELDIR all || exit 1
+		else
+		    make COPT_FLAGS="$FLAGS" KERNEL_DIR=$KERNELDIR all || exit 1
+		fi
 		strip_debug
 		# install it, so other programs can use it
 		make install || exit 1