jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.217

3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.217
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.217
3ef2ca
Problem:    When src/auto/configure was updated, "make clean" would run
3ef2ca
	    configure pointlessly.
3ef2ca
Solution:   Do not run configure for "make clean" and "make distclean" when
3ef2ca
	    the make program supports $MAKECMDGOALS. (Ken Takata)
3ef2ca
Files:	    src/Makefile
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.216/src/Makefile	2014-02-05 12:36:36.622026833 +0100
3ef2ca
--- src/Makefile	2014-03-25 15:31:10.629929307 +0100
3ef2ca
***************
3ef2ca
*** 546,551 ****
3ef2ca
--- 546,552 ----
3ef2ca
  # again.
3ef2ca
  #CC = cc
3ef2ca
  #CC = gcc
3ef2ca
+ #CC = clang
3ef2ca
  
3ef2ca
  # COMPILER FLAGS - change as you please. Either before running {{{1
3ef2ca
  # configure or afterwards. For examples see below.
3ef2ca
***************
3ef2ca
*** 1666,1672 ****
3ef2ca
  	    ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
3ef2ca
  		rm auto/config.cache; \
3ef2ca
  	fi
3ef2ca
! 	GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
3ef2ca
  		CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
3ef2ca
  		LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
3ef2ca
  		./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \
3ef2ca
--- 1667,1674 ----
3ef2ca
  	    ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
3ef2ca
  		rm auto/config.cache; \
3ef2ca
  	fi
3ef2ca
! 	if test "X$(MAKECMDGOALS)" != "Xclean" -a "X$(MAKECMDGOALS)" != "Xdistclean"; then \
3ef2ca
! 	    GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
3ef2ca
  		CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
3ef2ca
  		LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
3ef2ca
  		./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \
3ef2ca
***************
3ef2ca
*** 1679,1685 ****
3ef2ca
  		$(CONF_OPT_COMPBY) $(CONF_OPT_ACL)  $(CONF_OPT_NETBEANS) \
3ef2ca
  		$(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
3ef2ca
  		$(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
3ef2ca
! 		$(CONF_OPT_SYSMOUSE)
3ef2ca
  
3ef2ca
  # Use "make reconfig" to rerun configure without cached values.
3ef2ca
  # When config.h changes, most things will be recompiled automatically.
3ef2ca
--- 1681,1688 ----
3ef2ca
  		$(CONF_OPT_COMPBY) $(CONF_OPT_ACL)  $(CONF_OPT_NETBEANS) \
3ef2ca
  		$(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
3ef2ca
  		$(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
3ef2ca
! 		$(CONF_OPT_SYSMOUSE); \
3ef2ca
! 	fi
3ef2ca
  
3ef2ca
  # Use "make reconfig" to rerun configure without cached values.
3ef2ca
  # When config.h changes, most things will be recompiled automatically.
3ef2ca
*** ../vim-7.4.216/src/version.c	2014-03-25 13:46:22.841832960 +0100
3ef2ca
--- src/version.c	2014-03-25 15:32:30.813930536 +0100
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     217,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
CRONE:  Who sent you?
3ef2ca
ARTHUR: The Knights Who Say GNU!
3ef2ca
CRONE:  Aaaagh!  (she looks around in rear) No!  We have no licenses here.
3ef2ca
           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///