X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=t%2Flogs%2Fconfigure;h=a73640ad39f45f7407f253ee86a2101f63465e86;hp=ba8adbdcd091a0d89bf21b6b3a485ca29af0dde9;hb=768e3101e9e4e22e0d775ca1191549d825b679d3;hpb=0f1a49d52e94c258e444548c34903d27346d8a52

diff --git a/t/logs/configure b/t/logs/configure
index ba8adbd..a73640a 100644
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -29,15 +29,15 @@ Host C compiler   gcc
   Compiler:              s390x-linux-gnu-gcc
   Compiler:              sparc-linux-gnu-gcc
 
-  C++ Compiler...: g++ -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -D_FORTIFY_SOURCE=2
+  C++ Compiler...: g++ -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -Wall -D_FORTIFY_SOURCE=2
 
   - General Compile FLAGS
       - CC  = mpicc
       - CXX = g++
       - FC  = f95
       - CPPFLAGS = -D_FORTIFY_SOURCE=2
-      - CFLAGS   = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
-      - CXXFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+      - CFLAGS   = -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security
+      - CXXFLAGS = -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security
       - FCFLAGS  = -g -O2
       - LDLAGS   =  -Wl,--as-needed
       - LIBS     =
@@ -45,7 +45,7 @@ Host C compiler   gcc
 Configure summary:
 
         Compiler....................:  gcc -std=gnu99
-        Compiler Flags..............:  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security  -Wall -Wextra
+        Compiler Flags..............:  -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security  -Wall -Wextra
         Prefix......................:  /usr
         Coding style checks.........:  no
         Enable debug................:  yes
@@ -57,7 +57,7 @@ Configuration:
   Compilation arch:      linux
 
   Compiler:              x86_64-linux-gnu-gcc
-  Compiler flags:        -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+  Compiler flags:        -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security
 
   Linker flags:          -rdynamic -Wl,-z,relro
   Libraries:             -lm
@@ -79,7 +79,7 @@ Looking for compiler... cc is executable.
 
 Compiler version:       gcc (Debian 4.6.3-1) 4.6.3
 
-configure: using CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -fPIC
+configure: using CFLAGS=-g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -fPIC
 configure: using LDFLAGS=-Wl,-z,relro -Wl,--as-needed -Wl,-z,now  -Wl,--as-needed
 
 configure: Compiling with gcc -fstack-protector-all et al.
@@ -90,8 +90,8 @@ echo Using CC="gcc"
 Using CC=gcc
 echo Using CXX="gcc"
 Using CXX=gcc
-echo Using ALL_CFLAGS="-D_FORTIFY_SOURCE=2  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"
-Using ALL_CFLAGS=-D_FORTIFY_SOURCE=2  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+echo Using ALL_CFLAGS="-D_FORTIFY_SOURCE=2  -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security"
+Using ALL_CFLAGS=-D_FORTIFY_SOURCE=2  -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security
 echo Using LDFLAGS="-Wl,-z,relro -Wl,--as-needed -fPIE -pie -Wall"
 Using LDFLAGS=-Wl,-z,relro -Wl,--as-needed -fPIE -pie -Wall
 
@@ -127,7 +127,7 @@ LibCapability (enhanced
   EXEC-PREFIX     = /usr
   VERSION         = 6.8.5
   CC              = gcc -std=gnu99 -std=gnu99
-  CFLAGS          = -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -fopenmp -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16
+  CFLAGS          = -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -fopenmp -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16
   CPPFLAGS        = -I/usr/include/ImageMagick-6
   PCFLAGS         = -fopenmp -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16
   DEFS            = -DHAVE_CONFIG_H
@@ -135,6 +135,6 @@ LibCapability (enhanced
   MAGICK_LDFLAGS  = -L/usr/lib/x86_64-linux-gnu -Wl,-z,relro -Wl,--as-needed -L/usr/lib/X11
   LIBS            = -lMagickCore -llcms2 -lfreetype -llqr-1 -lglib-2.0 -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -llzma -lbz2 -lz -lltdl -lm -lgomp - lpthread
   CXX             = g++
-  CXXFLAGS        = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -pthread
+  CXXFLAGS        = -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -pthread
   FEATURES        = DPC OpenMP Modules
   DELEGATES       = bzlib djvu mpeg fftw fontconfig freetype jbig jng jp2 jpeg lcms lqr lzma openexr pango png ps tiff wmf x xml zlib