Mercurial > vim
changeset 12461:20dd08d26680 v8.0.1110
patch 8.0.1110: FORTIFY_SOURCE from Perl causes problems
commit https://github.com/vim/vim/commit/e8ff56b28ed67bff4ee1dbe7b4bd620c1c04a535
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 14 23:06:23 2017 +0200
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 https://github.com/vim/vim/issues/2068)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 14 Sep 2017 23:15:04 +0200 |
| parents | 0bff6c027b94 |
| children | fe770e309760 |
| files | src/auto/configure src/configure.ac src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5717,9 +5717,10 @@ fi 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 //'`
--- a/src/configure.ac +++ b/src/configure.ac @@ -1005,9 +1005,11 @@ if test "$enable_perlinterp" = "yes" -o 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' \