Mercurial > vim

comparison src/configure.ac @ 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
comparison
equal deleted inserted replaced
18647:7fe816006953 18648:53e66eb23321
3787 # include <canberra.h> 3787 # include <canberra.h>
3788 ], [ 3788 ], [
3789 ca_context *hello; 3789 ca_context *hello;
3790 ca_context_create(&hello);], 3790 ca_context_create(&hello);],
3791 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CANBERRA), 3791 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CANBERRA),
3792 AC_MSG_RESULT(no); CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS") 3792 AC_MSG_RESULT(no; try installing libcanberra-dev); CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS")
3793 fi 3793 fi
3794 3794
3795 3795
3796 dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible 3796 dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
3797 AC_MSG_CHECKING(for st_blksize) 3797 AC_MSG_CHECKING(for st_blksize)
4480 dnl Also remove duplicate _FORTIFY_SOURCE arguments. 4480 dnl Also remove duplicate _FORTIFY_SOURCE arguments.
4481 dnl And undefine it first to avoid a warning. 4481 dnl And undefine it first to avoid a warning.
4482 AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) 4482 AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
4483 if test "$gccmajor" -gt "3"; then 4483 if test "$gccmajor" -gt "3"; then
4484 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/'` 4484 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/'`
4485 CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'`
4485 AC_MSG_RESULT(yes) 4486 AC_MSG_RESULT(yes)
4486 else 4487 else
4487 AC_MSG_RESULT(no) 4488 AC_MSG_RESULT(no)
4488 fi 4489 fi
4489 fi 4490 fi