To: vim_dev@googlegroups.com

Subject: Patch 7.3.368

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.368

Problem:    Gcc complains about redefining _FORTIFY_SOURCE.

Solution:   Undefine it before redefining it.

Files:	    src/Makefile, src/configure.in, src/auto/configure

*** ../vim-7.3.367/src/Makefile	2011-10-20 16:35:25.000000000 +0200

--- src/Makefile	2011-12-08 15:16:13.000000000 +0100

***************

*** 561,568 ****

  #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes

  # Use this with GCC to check for mistakes, unused arguments, etc.

! #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -D_FORTIFY_SOURCE=1

! #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -D_FORTIFY_SOURCE=1 -DU_DEBUG

  #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers

  #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter

--- 561,568 ----

  #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes

  # Use this with GCC to check for mistakes, unused arguments, etc.

! #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1

! #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG

  #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers

  #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter

*** ../vim-7.3.367/src/configure.in	2011-09-02 12:27:20.000000000 +0200

--- src/configure.in	2011-12-01 20:23:22.000000000 +0100

***************

*** 3584,3592 ****

    dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is

    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.

    dnl Also remove duplicate _FORTIFY_SOURCE arguments.

    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/$/ -D_FORTIFY_SOURCE=1/'`

      AC_MSG_RESULT(yes)

    else

      AC_MSG_RESULT(no)

--- 3584,3593 ----

    dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is

    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.

    dnl Also remove duplicate _FORTIFY_SOURCE arguments.

+   dnl And undefine it first to avoid a warning.

    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 -D_FORTIFY_SOURCE=1/'`

      AC_MSG_RESULT(yes)

    else

      AC_MSG_RESULT(no)

*** ../vim-7.3.367/src/auto/configure	2011-09-02 12:27:20.000000000 +0200

--- src/auto/configure	2011-12-01 20:24:02.000000000 +0100

***************

*** 12483,12492 ****

      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

  $as_echo "no" >&6; }

    fi

!         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5

  $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/$/ -D_FORTIFY_SOURCE=1/'`

      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

  $as_echo "yes" >&6; }

    else

--- 12483,12492 ----

      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

  $as_echo "no" >&6; }

    fi

!           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5

  $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 -D_FORTIFY_SOURCE=1/'`

      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

  $as_echo "yes" >&6; }

    else

*** ../vim-7.3.367/src/version.c	2011-12-08 15:14:04.000000000 +0100

--- src/version.c	2011-12-08 15:15:13.000000000 +0100

***************

*** 716,717 ****

--- 716,719 ----

  {   /* Add new patch number below this line */

+ /**/

+     368,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

248. You sign your letters with your e-mail address instead of your name.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///