patch 8.0.1110: FORTIFY_SOURCE from Perl causes problems

Problem:    FORTIFY_SOURCE from Perl causes problems. (Scott Baker)
Solution:   Filter out the flag. (Christian Brabandt, closes #2068)

diff --git a/src/auto/configure b/src/auto/configure
index 7e46662023b9806f0b20e28b67f906d0d54ec67a..51dbd48ad7f984d6e4391bc80ce13888a352eaa6 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5717,9 +5717,10 @@ $as_echo "OK" >&6; }
        fi
       done
 
-                  perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
-             -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//' \
-                       -e 's/-fdebug-prefix-map[^ ]*//g'`
+                        perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
+               -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//' \
+               -e 's/-fdebug-prefix-map[^ ]*//g' \
+               -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=.//g`
             perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
                sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
                        -e 's/-bE:perl.exp//' -e 's/-lc //'`

diff --git a/src/configure.ac b/src/configure.ac
index 918c36c1dac0349b80d53f7026f7f32023330480..2c24ae40054f52b3b0178f33e591aa51cb43f94f 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1005,9 +1005,11 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
       AC_SUBST(vi_cv_perl_xsubpp)
       dnl Remove "-fno-something", it breaks using cproto.
       dnl Remove "-fdebug-prefix-map", it isn't supported by clang.
+      dnl Remove "FORTIFY_SOURCE", it will be defined twice.
       perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
-             -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//' \
-                       -e 's/-fdebug-prefix-map[[^ ]]*//g'`
+               -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//' \
+               -e 's/-fdebug-prefix-map[[^ ]]*//g' \
+               -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=.//g`
       dnl Remove "-lc", it breaks on FreeBSD when using "-pthread".
       perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
                sed -e '/Warning/d' -e '/Note (probably harmless)/d' \

diff --git a/src/version.c b/src/version.c
index c4a1adac5d185264ebcd652746e30853976ec6e5..fe7a30c9083ff51d243b8d1f87bb83fb7be9e5f9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1110,
 /**/
     1109,
 /**/