rpms/dietlibc/devel dietlibc.spec,1.28,1.29

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29617

Modified Files:
	dietlibc.spec 
Log Message:
reenabled '-fno-stack-protector' for non-i386/x86_64 archs


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dietlibc.spec	1 Sep 2007 12:35:38 -0000	1.28
+++ dietlibc.spec	1 Sep 2007 13:09:57 -0000	1.29
@@ -35,6 +35,7 @@
 Source1:	http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch10:	dietlibc-0.29-scall.patch
+Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
 Patch31:	dietlibc-0.31-defpath.patch
 Patch32:	dietlibc-0.31-stacksmash.patch
@@ -73,9 +74,18 @@
 %patch32 -p1 -b .stacksmash
 %patch33 -p1 -b .stacksmash-dyn
 
+%ifnarch i386 x86_64
+%patch20 -p1 -b .nostackprotector
+sed -i -e 's!^#define WANT_SSP$!// \0!g;
+	   s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+%global xtra_fixcflags	-fno-stack-protector
+%else
+%global xtra_fixcflags	%nil
+%endif
+
 sed -i -e 's!strip !: !g' Makefile
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags