diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-17 19:07:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-17 19:07:42 +0100 |
| commit | 91b992c38769b343b4a66a5f8e589aa9897fdc9f (patch) | |
| tree | dab0af77605e0250a5a819e4c552107358ab548f | |
| parent | 539aa6b25eaea91dfd1a175cd053c0f259fa2e58 (diff) | |
| download | vim-git-91b992c38769b343b4a66a5f8e589aa9897fdc9f.tar.gz | |
patch 8.1.2316: FORTIFY_SOURCE can also be present in CPPFLAGSv8.1.2316
Problem: FORTIFY_SOURCE can also be present in CPPFLAGS.
Solution: Remove it in configure. (Benedikt Morbach, closes #2786)
| -rwxr-xr-x | src/auto/configure | 5 | ||||
| -rw-r--r-- | src/configure.ac | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/auto/configure b/src/auto/configure index 61b727250..d591ab5f1 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -12989,8 +12989,8 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "yes" >&6; }; $as_echo "#define HAVE_CANBERRA 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; try installing libcanberra-dev" >&5 +$as_echo "no; try installing libcanberra-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14807,6 +14807,7 @@ $as_echo "no" >&6; } $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } if test "$gccmajor" -gt "3"; then CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` + CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/src/configure.ac b/src/configure.ac index b59914b62..4065817f3 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -3789,7 +3789,7 @@ if test "$enable_canberra" = "yes"; then ca_context *hello; ca_context_create(&hello);], AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CANBERRA), - AC_MSG_RESULT(no); CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS") + AC_MSG_RESULT(no; try installing libcanberra-dev); CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS") fi @@ -4482,6 +4482,7 @@ if test "$GCC" = yes; then AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) if test "$gccmajor" -gt "3"; then CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` + CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) diff --git a/src/version.c b/src/version.c index b6a209d7e..aae3fae1f 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2316, +/**/ 2315, /**/ 2314, |