Skip to content

Commit e8ff56b

Browse files
committed
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)
1 parent f5291f3 commit e8ff56b

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/auto/configure

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5717,9 +5717,10 @@ $as_echo "OK" >&6; }
57175717
fi
57185718
done
57195719

5720-
perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
5721-
-e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//' \
5722-
-e 's/-fdebug-prefix-map[^ ]*//g'`
5720+
perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
5721+
-e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//' \
5722+
-e 's/-fdebug-prefix-map[^ ]*//g' \
5723+
-e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=.//g`
57235724
perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
57245725
sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
57255726
-e 's/-bE:perl.exp//' -e 's/-lc //'`

src/configure.ac

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,9 +1005,11 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
10051005
AC_SUBST(vi_cv_perl_xsubpp)
10061006
dnl Remove "-fno-something", it breaks using cproto.
10071007
dnl Remove "-fdebug-prefix-map", it isn't supported by clang.
1008+
dnl Remove "FORTIFY_SOURCE", it will be defined twice.
10081009
perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
1009-
-e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//' \
1010-
-e 's/-fdebug-prefix-map[[^ ]]*//g'`
1010+
-e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//' \
1011+
-e 's/-fdebug-prefix-map[[^ ]]*//g' \
1012+
-e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=.//g`
10111013
dnl Remove "-lc", it breaks on FreeBSD when using "-pthread".
10121014
perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
10131015
sed -e '/Warning/d' -e '/Note (probably harmless)/d' \

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ static char *(features[]) =
769769

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
1110,
772774
/**/
773775
1109,
774776
/**/

0 commit comments

Comments
 (0)