Karsten Hopp 0b8066
To: vim_dev@googlegroups.com
Karsten Hopp 0b8066
Subject: Patch 7.3.722
Karsten Hopp 0b8066
Fcc: outbox
Karsten Hopp 0b8066
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 0b8066
Mime-Version: 1.0
Karsten Hopp 0b8066
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 0b8066
Content-Transfer-Encoding: 8bit
Karsten Hopp 0b8066
------------
Karsten Hopp 0b8066
Karsten Hopp 0b8066
Patch 7.3.722
Karsten Hopp 0b8066
Problem:    Perl flags may contain "-g", which breaks "make proto".
Karsten Hopp 0b8066
Solution:   Filter out the "-g" flag for cproto. (Ken Takata)
Karsten Hopp 0b8066
Files:	    src/Makefile
Karsten Hopp 0b8066
Karsten Hopp 0b8066
Karsten Hopp 0b8066
*** ../vim-7.3.721/src/Makefile	2012-07-25 16:32:03.000000000 +0200
Karsten Hopp 0b8066
--- src/Makefile	2012-11-20 17:02:22.000000000 +0100
Karsten Hopp 0b8066
***************
Karsten Hopp 0b8066
*** 1753,1762 ****
Karsten Hopp 0b8066
  # Filter out arguments that cproto doesn't support.
Karsten Hopp 0b8066
  # Don't pass "-pthread" to cproto, it sees it as a list of individual flags.
Karsten Hopp 0b8066
  # Don't pass "-fstack-protector" to cproto, for the same reason.
Karsten Hopp 0b8066
  # The -E"gcc -E" argument must be separate to avoid problems with shell
Karsten Hopp 0b8066
  # quoting.
Karsten Hopp 0b8066
  CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
Karsten Hopp 0b8066
! 	 `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g'`
Karsten Hopp 0b8066
  
Karsten Hopp 0b8066
  ### Would be nice if this would work for "normal" make.
Karsten Hopp 0b8066
  ### Currently it only works for (Free)BSD make.
Karsten Hopp 0b8066
--- 1753,1763 ----
Karsten Hopp 0b8066
  # Filter out arguments that cproto doesn't support.
Karsten Hopp 0b8066
  # Don't pass "-pthread" to cproto, it sees it as a list of individual flags.
Karsten Hopp 0b8066
  # Don't pass "-fstack-protector" to cproto, for the same reason.
Karsten Hopp 0b8066
+ # Don't pass "-g" to cproto.
Karsten Hopp 0b8066
  # The -E"gcc -E" argument must be separate to avoid problems with shell
Karsten Hopp 0b8066
  # quoting.
Karsten Hopp 0b8066
  CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
Karsten Hopp 0b8066
! 	 `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g' -e 's/\ -g\ / /g'`
Karsten Hopp 0b8066
  
Karsten Hopp 0b8066
  ### Would be nice if this would work for "normal" make.
Karsten Hopp 0b8066
  ### Currently it only works for (Free)BSD make.
Karsten Hopp 0b8066
*** ../vim-7.3.721/src/version.c	2012-11-20 16:59:09.000000000 +0100
Karsten Hopp 0b8066
--- src/version.c	2012-11-20 17:02:54.000000000 +0100
Karsten Hopp 0b8066
***************
Karsten Hopp 0b8066
*** 727,728 ****
Karsten Hopp 0b8066
--- 727,730 ----
Karsten Hopp 0b8066
  {   /* Add new patch number below this line */
Karsten Hopp 0b8066
+ /**/
Karsten Hopp 0b8066
+     722,
Karsten Hopp 0b8066
  /**/
Karsten Hopp 0b8066
Karsten Hopp 0b8066
-- 
Karsten Hopp 0b8066
The future isn't what it used to be.
Karsten Hopp 0b8066
Karsten Hopp 0b8066
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 0b8066
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 0b8066
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 0b8066
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///