rpms/ethereal/devel ethereal.spec,1.46,1.47

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Aug 2 07:55:36 UTC 2005


Author: jnovy

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25027

Modified Files:
	ethereal.spec 
Log Message:

- better approach to -fstack-protector-all




Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ethereal.spec	2 Aug 2005 07:47:37 -0000	1.46
+++ ethereal.spec	2 Aug 2005 07:55:32 -0000	1.47
@@ -62,9 +62,11 @@
 %else
 export PIECFLAGS="-fpie"
 %endif
+# FC5+ automatic -fstack-protector-all switch
+export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
 #./autogen.sh
-export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -fstack-protector-all"
-export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -fstack-protector-all"
+export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export LDFLAGS="$LDFLAGS -lm"
 %configure \
    --bindir=%{_sbindir} \




More information about the fedora-cvs-commits mailing list