[Devil-linux-commit] build/scripts openh323,1.12,1.13 pwlib,1.15,1.16

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

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

Modified Files:
	openh323 pwlib 
Log Message:
make sure we still can compile with a non ssp gcc
started cleaning up kernel config
added first options for kernel 2.6.10


Index: pwlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pwlib	28 Dec 2004 22:57:00 -0000	1.15
+++ pwlib	29 Dec 2004 20:48:41 -0000	1.16
@@ -30,12 +30,16 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_PWLIB" = "y" ]; then
+        	FLAGS=""
+	        if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+            		FLAGS="-fno-stack-protector"
+		fi
 		rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so
 		export PWLIBDIR=$PWD
 		./configure --prefix=/usr || exit 1
 		# parallel builds fails ($PMAKE)
 		make bothdepend || exit 1
-		make RPM_OPT_FLAGS="-fno-stack-protector"  $PMAKE || exit 1
+		make RPM_OPT_FLAGS="$FLAGS"  $PMAKE || exit 1
 		strip_debug
 		make install || exit 1
 	    fi

Index: openh323
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- openh323	29 Dec 2004 02:42:26 -0000	1.12
+++ openh323	29 Dec 2004 20:48:41 -0000	1.13
@@ -30,7 +30,11 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_OPENH323" = "y" ]; then
-		rm -f /usr/lib/libopenh323*
+                FLAGS=""
+                if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+                        FLAGS="-fno-stack-protector"
+                fi
+  		rm -f /usr/lib/libopenh323*
 		export OPENH323DIR=$PWD
 		pushd .. > /dev/null
 		export PWLIBDIR=$PWD/pwlib
@@ -38,7 +42,7 @@
 		./configure --prefix=/usr || exit 1
 		# don't use parallel builds ($PMAKE)
 		make bothdepend || exit 1
-		make RPM_OPT_FLAGS="-fno-stack-protector"  $PMAKE || exit 1
+		make RPM_OPT_FLAGS="$FLAGS"  $PMAKE || exit 1
 		strip_debug
 		make install || exit 1
 	    fi