jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.510

073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.510
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.510
073263
Problem:    "-fwrapv" argument breaks use of cproto.
073263
Solution:   Remove the alphabetic arguments in a drastic way.
073263
Files:	    src/Makefile
073263
073263
073263
*** ../vim-7.4.509/src/Makefile	2014-11-05 18:05:48.652441306 +0100
073263
--- src/Makefile	2014-11-12 15:24:56.357941730 +0100
073263
***************
073263
*** 1779,1791 ****
073263
  proto: $(PRO_AUTO) $(PRO_MANUAL)
073263
  
073263
  # Filter out arguments that cproto doesn't support.
073263
! # Don't pass "-pthread" to cproto, it sees it as a list of individual flags.
073263
! # Don't pass "-fstack-protector" to cproto, for the same reason.
073263
! # Don't pass "-g" to cproto.
073263
  # The -E"gcc -E" argument must be separate to avoid problems with shell
073263
  # quoting.
073263
  CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
073263
! 	 `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g' -e 's/\ -g\ / /g'`
073263
  
073263
  ### Would be nice if this would work for "normal" make.
073263
  ### Currently it only works for (Free)BSD make.
073263
--- 1779,1790 ----
073263
  proto: $(PRO_AUTO) $(PRO_MANUAL)
073263
  
073263
  # Filter out arguments that cproto doesn't support.
073263
! # Don't pass "-pthread", "-fwrapv" and similar arguments to cproto, it sees
073263
! # them as a list of individual flags.
073263
  # The -E"gcc -E" argument must be separate to avoid problems with shell
073263
  # quoting.
073263
  CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
073263
! 	 `echo '$(LINT_CFLAGS)' | sed -e 's/ -[a-z-]\+//g'`
073263
  
073263
  ### Would be nice if this would work for "normal" make.
073263
  ### Currently it only works for (Free)BSD make.
073263
*** ../vim-7.4.509/src/version.c	2014-11-12 15:15:34.983882077 +0100
073263
--- src/version.c	2014-11-12 15:37:34.401182559 +0100
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     510,
073263
  /**/
073263
073263
-- 
073263
       [Autumn changed into Winter ... Winter changed into Spring ...  Spring
073263
       changed back into Autumn and Autumn gave Winter and Spring a miss and
073263
       went straight on into Summer ...  Until one day ...]
073263
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///