diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-14 23:06:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-14 23:06:23 +0200 |
| commit | e8ff56b28ed67bff4ee1dbe7b4bd620c1c04a535 (patch) | |
| tree | 37d0f18ba1395e2ee2d5f6a5b58369c9b387231d | |
| parent | f5291f301e9322545f0621b2157e93050d1d4fb3 (diff) | |
| download | vim-e8ff56b28ed67bff4ee1dbe7b4bd620c1c04a535.zip | |
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)
| -rwxr-xr-x | src/auto/configure | 7 | ||||
| -rw-r--r-- | src/configure.ac | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index 7e4666202..51dbd48ad 100755 --- 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 918c36c1d..2c24ae400 100644 --- 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 c4a1adac5..fe7a30c90 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1110, +/**/ 1109, /**/ 1108, |