diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-27 21:42:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-27 21:42:08 +0200 |
| commit | 1ec96c926974208bd47710384c8202c47d0752d0 (patch) | |
| tree | 5c2cd9d9f8578d9d0d67341eaf41dfdf301ab4db | |
| parent | d1bc96ce2466ac1b4af4a2c36de455a1df318d1d (diff) | |
patch 8.0.1156: trouble from removing one -W argument from Perl CFLAGSv8.0.1156
Problem: Removing one -W argument from Perl CFLAGS may cause trouble.
Solution: Remove all -W flags. (Christian Brabandt)
| -rwxr-xr-x | src/auto/configure | 8 | ||||
| -rw-r--r-- | src/configure.ac | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index 04b997d631..947860f168 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5717,10 +5717,12 @@ $as_echo "OK" >&6; } fi done - perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ + 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'` + -e 's/-pipe //' \ + -e 's/-W[^ ]*//g' \ + -e 's/-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 //'` @@ -5761,7 +5763,7 @@ rm -f core conftest.err conftest.$ac_objext \ LDFLAGS=$ldflags_save if test $perl_ok = yes; then if test "X$perlcppflags" != "X"; then - PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[^ ]*//'` + PERL_CFLAGS=$perlcppflags fi if test "X$perlldflags" != "X"; then if test "X`echo \"$LDFLAGS\" | $FGREP -e \"$perlldflags\"`" = "X"; then diff --git a/src/configure.ac b/src/configure.ac index 1183ab44b6..76714b1e7b 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1006,10 +1006,13 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then 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. + dnl remove -pipe and -Wxxx, it confuses cproto 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'` + -e 's/-pipe //' \ + -e 's/-W[[^ ]]*//g' \ + -e 's/-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' \ @@ -1037,8 +1040,7 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then LDFLAGS=$ldflags_save if test $perl_ok = yes; then if test "X$perlcppflags" != "X"; then - dnl remove -pipe and -Wxxx, it confuses cproto - PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[[^ ]]*//'` + PERL_CFLAGS=$perlcppflags fi if test "X$perlldflags" != "X"; then if test "X`echo \"$LDFLAGS\" | $FGREP -e \"$perlldflags\"`" = "X"; then diff --git a/src/version.c b/src/version.c index ba4f56a6fa..902b05c76b 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1156, +/**/ 1155, /**/ 1154, |