[criu] Delete all kind of -fstack-protector gcc options

Andrey Vagin avagin at fedoraproject.org
Tue Dec 10 16:43:23 UTC 2013


commit 8004c07963ebf1fbf3441a0e4b10303fe059bc10
Author: Andrey Vagin <avagin at openvz.org>
Date:   Wed Jul 24 12:52:38 2013 +0400

    Delete all kind of -fstack-protector gcc options
    
    This patch fixes the compilation error:
    gcc -c -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -strong
    --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -O2
    -Wall -DCONFIG_X86_64 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Iprotobuf/
    protobuf/stats.pb-c.c -o protobuf/stats.o
    gcc: error: unrecognized command line option '-strong'
    
    $ echo -fstack-protector-strong | sed -e 's,-fstack-protector,,g'
    -strong
    
    Signed-off-by: Andrey Vagin <avagin at openvz.org>

 crtools.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/crtools.spec b/crtools.spec
index 3a32dca..dee7409 100644
--- a/crtools.spec
+++ b/crtools.spec
@@ -1,6 +1,6 @@
 Name: crtools	
 Version: 0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tool for Checkpoint/Restore in User-space
 Group: System Environment/Base
 License: GPLv2
@@ -33,7 +33,7 @@ Linux in user-space.
 %build
 # %{?_smp_mflags} does not work
 # -fstack-protector breaks build
-CFLAGS+=`echo %{optflags} | sed -e 's,-fstack-protector,,g'` make V=1 WERROR=0 PREFIX=%{_prefix}
+CFLAGS+=`echo %{optflags} | sed -e 's,-fstack-protector\S*,,g'` make V=1 WERROR=0 PREFIX=%{_prefix}
 make docs V=1
 
 
@@ -51,6 +51,9 @@ ln -s %{_sbindir}/criu $RPM_BUILD_ROOT%{_sbindir}/crtools
 
 %changelog
 * Wed Jul 24 2013 Andrew Vagin <avagin at openvz.org> - 0.6-3
+- Delete all kind of -fstack-protector gcc options
+
+* Wed Jul 24 2013 Andrew Vagin <avagin at openvz.org> - 0.6-3
 - Added arm macro to ExclusiveArch
 
 * Wed Jul 03 2013 Andrew Vagin <avagin at openvz.org> - 0.6-2


More information about the scm-commits mailing list