[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] SVN commit in tools r640 - rpm-setup/trunk
From:       cvsrep () annvix ! org
Date:       2007-08-18 22:21:38
Message-ID: E1IMWfq-0006rK-QP () hades ! annvix ! org
[Download RAW message or body]

Author: vdanen
Date: 2007-08-18 16:21:38 -0600 (Sat, 18 Aug 2007)
New Revision: 640

Modified:
   rpm-setup/trunk/macros.in
Log:
- serverbuild fixes from Anssi Hannula


Modified: rpm-setup/trunk/macros.in
===================================================================
--- rpm-setup/trunk/macros.in	2007-07-18 02:43:08 UTC (rev 639)
+++ rpm-setup/trunk/macros.in	2007-08-18 22:21:38 UTC (rev 640)
@@ -67,7 +67,8 @@
 
 # common compilation flags
 %_fortify_cflags -Wp,-D_FORTIFY_SOURCE=2
-%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4
+%_serverbuild_flags %nil
+%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4 %{?_serverbuild_flags}
 %__common_cflags -O2 %{debugcflags} -pipe %{?_fortify_cflags:%_fortify_cflags} \
%{?_ssp_cflags:%_ssp_cflags} -fexceptions  
 #==============================================================================
@@ -336,8 +337,7 @@
 #
 
 # Servers opt flags
-%serverbuild export CFLAGS="%optflags -fstack-protector-all"; export \
CXXFLAGS="%optflags -fstack-protector-all"; export RPM_OPT_FLAGS="%optflags \
                -fstack-protector-all" \
-%{nil}
+%serverbuild %define _serverbuild_flags -fstack-protector-all
 
 %__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f \
configure.ac ] && %{__libtoolize} --copy --force)}  


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs


[prev in list] [next in list] [prev in thread] [next in thread]