From 7e9fe8870b9e3765e783fe73141ac40c6a3e97f5 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 20 Dec 2007 09:48:47 +0000 Subject: make %serverbuild modify %optflags instead of shell variables (Anssi) (#32050) --- macros.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/macros.in b/macros.in index a8af40a..b537db5 100644 --- a/macros.in +++ b/macros.in @@ -84,7 +84,8 @@ Group: %{group}\ # 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} %{?_ssp_cflags} -fexceptions #============================================================================== @@ -456,8 +457,7 @@ then %{_scrollkeeper_bin} -q || true ; fi \ # # 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)} -- cgit v1.2.1