lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
a8ac23e
To: vim_dev@googlegroups.com
a8ac23e
Subject: Patch 7.4.300
a8ac23e
Fcc: outbox
a8ac23e
From: Bram Moolenaar <Bram@moolenaar.net>
a8ac23e
Mime-Version: 1.0
a8ac23e
Content-Type: text/plain; charset=UTF-8
a8ac23e
Content-Transfer-Encoding: 8bit
a8ac23e
------------
a8ac23e
a8ac23e
Patch 7.4.300
a8ac23e
Problem:    The way config.cache is removed doesn't always work.
a8ac23e
Solution:   Always remove config.cache. (Ken Takata)
a8ac23e
Files:	    src/Makefile
a8ac23e
a8ac23e
a8ac23e
*** ../vim-7.4.299/src/Makefile	2014-04-29 20:04:05.331539784 +0200
a8ac23e
--- src/Makefile	2014-05-22 14:48:23.034475967 +0200
a8ac23e
***************
a8ac23e
*** 1664,1675 ****
a8ac23e
  # auto/config.h isn't updated.  The dependency on auto/config.mk should make
a8ac23e
  # sure configure is run when it's needed.
a8ac23e
  #
a8ac23e
  config auto/config.mk: auto/configure config.mk.in config.h.in
a8ac23e
! 	if test -f auto/config.cache && \
a8ac23e
! 	    grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
a8ac23e
! 	    ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
a8ac23e
! 		rm auto/config.cache; \
a8ac23e
! 	fi
a8ac23e
  	if test "X$(MAKECMDGOALS)" != "Xclean" \
a8ac23e
  		-a "X$(MAKECMDGOALS)" != "Xdistclean" \
a8ac23e
  		-a "X$(MAKECMDGOALS)" != "Xautoconf" \
a8ac23e
--- 1664,1674 ----
a8ac23e
  # auto/config.h isn't updated.  The dependency on auto/config.mk should make
a8ac23e
  # sure configure is run when it's needed.
a8ac23e
  #
a8ac23e
+ # Remove the config.cache every time, once in a while it causes problems that
a8ac23e
+ # are very hard to figure out.
a8ac23e
+ #
a8ac23e
  config auto/config.mk: auto/configure config.mk.in config.h.in
a8ac23e
! 	-rm -f auto/config.cache
a8ac23e
  	if test "X$(MAKECMDGOALS)" != "Xclean" \
a8ac23e
  		-a "X$(MAKECMDGOALS)" != "Xdistclean" \
a8ac23e
  		-a "X$(MAKECMDGOALS)" != "Xautoconf" \
a8ac23e
*** ../vim-7.4.299/src/version.c	2014-05-22 14:44:08.098481148 +0200
a8ac23e
--- src/version.c	2014-05-22 14:51:36.022472045 +0200
a8ac23e
***************
a8ac23e
*** 736,737 ****
a8ac23e
--- 736,739 ----
a8ac23e
  {   /* Add new patch number below this line */
a8ac23e
+ /**/
a8ac23e
+     300,
a8ac23e
  /**/
a8ac23e
a8ac23e
a8ac23e
-- 
a8ac23e
What is the difference between a professional and an amateur?
a8ac23e
The ark was built by an amateur; professionals gave us the Titanic.
a8ac23e
a8ac23e
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
a8ac23e
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
a8ac23e
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
a8ac23e
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///