3 files changed, 23 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index 1bacd27..6452bb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.67, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.68, nanardon@mandriva.org)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9)
 AC_CONFIG_SRCDIR
diff --git a/macros.in b/macros.in
index b537db5..a8d91d3 100644
--- a/macros.in
+++ b/macros.in
@@ -86,7 +86,8 @@ Group: %{group}\
 %_fortify_cflags -Wp,-D_FORTIFY_SOURCE=2
 %_serverbuild_flags %nil
 %_ssp_cflags -fstack-protector --param=ssp-buffer-size=4 %{?_serverbuild_flags}
-%__common_cflags -O2 %{debugcflags} -pipe %{?_fortify_cflags} %{?_ssp_cflags} -fexceptions
+%__common_cflags -O2 %{debugcflags} -pipe %{?_fortify_cflags} -fexceptions
+%__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags}
 
 #==============================================================================
 # ---- Optional rpmrc macros.
diff --git a/rpmrc.in b/rpmrc.in
index 68e793d..a86a1b7 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -5,18 +5,20 @@
 #############################################################
 # Values for RPM_OPT_FLAGS for various platforms
 
-optflags: i386 %{__common_cflags} -fomit-frame-pointer -march=i386 -fasynchronous-unwind-tables
-optflags: i486 %{__common_cflags} -fomit-frame-pointer -march=i486 -fasynchronous-unwind-tables
-optflags: k6   %{__common_cflags} -fomit-frame-pointer -march=k6 -fasynchronous-unwind-tables
-optflags: i586 %{__common_cflags} -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables
-optflags: i686 %{__common_cflags} -fomit-frame-pointer -march=i686 -fasynchronous-unwind-tables
-optflags: athlon %{__common_cflags} -fomit-frame-pointer -march=athlon -fasynchronous-unwind-tables
-optflags: pentium3 %{__common_cflags} -fomit-frame-pointer -march=pentium3 -fasynchronous-unwind-tables
-optflags: pentium4 %{__common_cflags} -fomit-frame-pointer -march=pentium4 -fasynchronous-unwind-tables
+optflags: i386 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i386 -fasynchronous-unwind-tables
+optflags: i486 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i486 -fasynchronous-unwind-tables
+optflags: k6   %{__common_cflags_with_ssp} -fomit-frame-pointer -march=k6 -fasynchronous-unwind-tables
+optflags: i586 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables
+optflags: i686 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i686 -fasynchronous-unwind-tables
+optflags: athlon %{__common_cflags_with_ssp} -fomit-frame-pointer -march=athlon -fasynchronous-unwind-tables
+optflags: pentium3 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium3 -fasynchronous-unwind-tables
+optflags: pentium4 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium4 -fasynchronous-unwind-tables
+
+optflags: x86_64 %{__common_cflags_with_ssp}
+optflags: amd64 %{__common_cflags_with_ssp}
+optflags: ia32e %{__common_cflags_with_ssp}
+
 optflags: ia64 %{__common_cflags}
-optflags: x86_64 %{__common_cflags}
-optflags: amd64 %{__common_cflags}
-optflags: ia32e %{__common_cflags}
   
   # XXX Please note that -mieee has been added in rpm-3.0.5.
 optflags: alpha %{__common_cflags} -mieee -mcpu=ev5
@@ -32,11 +34,11 @@ optflags: sparc64 %{__common_cflags} -m64 -mcpu=ultrasparc
 
 optflags: m68k %{__common_cflags} -fomit-frame-pointer
 
-optflags: ppc %{__common_cflags} -fsigned-char -mcpu=750 -mtune=7450
-optflags: ppciseries %{__common_cflags} -fsigned-char
-optflags: ppcpseries %{__common_cflags} -fsigned-char
-optflags: ppc32 %{__common_cflags} -m32 -fsigned-char -mcpu=power4 -mtune=cell
-optflags: ppc64 %{__common_cflags} -m64 -fsigned-char -mcpu=power4 -mtune=cell
+optflags: ppc %{__common_cflags_with_ssp} -fsigned-char -mcpu=750 -mtune=7450
+optflags: ppciseries %{__common_cflags_with_ssp} -fsigned-char
+optflags: ppcpseries %{__common_cflags_with_ssp} -fsigned-char
+optflags: ppc32 %{__common_cflags_with_ssp} -m32 -fsigned-char -mcpu=power4 -mtune=cell
+optflags: ppc64 %{__common_cflags_with_ssp} -m64 -fsigned-char -mcpu=power4 -mtune=cell
 
 optflags: parisc %{__common_cflags} -mpa-risc-1-0
 optflags: hppa1.0 %{__common_cflags} -mpa-risc-1-0
@@ -59,8 +61,8 @@ optflags: atariclone %{__common_cflags} -fomit-frame-pointer
 optflags: milan %{__common_cflags} -fomit-frame-pointer
 optflags: hades %{__common_cflags} -fomit-frame-pointer
 
-optflags: s390 %{__common_cflags}
-optflags: s390x %{__common_cflags}
+optflags: s390 %{__common_cflags_with_ssp}
+optflags: s390x %{__common_cflags_with_ssp}
 
 #############################################################
 # Canonical arch names and numbers