Mercurial > vim

diff src/auto/configure @ 18648:53e66eb23321 v8.1.2316

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2316: FORTIFY_SOURCE can also be present in CPPFLAGS Commit: https://github.com/vim/vim/commit/91b992c38769b343b4a66a5f8e589aa9897fdc9f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Nov 17 19:07:42 2019 +0100 patch 8.1.2316: FORTIFY_SOURCE can also be present in CPPFLAGS Problem: FORTIFY_SOURCE can also be present in CPPFLAGS. Solution: Remove it in configure. (Benedikt Morbach, closes https://github.com/vim/vim/issues/2786)
author Bram Moolenaar <Bram@vim.org>
date Sun, 17 Nov 2019 19:15:03 +0100
parents 2329061e6289
children 9007e9896303
line wrap: on
line diff
--- 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 @@ if test "$GCC" = yes; then
 $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