diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-25 23:29:36 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 15:16:15 -0700 |
commit | 3152fcc3bbd4cabf01c7e70766a305ce4c725881 (patch) | |
tree | 59b07e5d76b8023848dff79ce5fe6b83cd536925 /patches/source/vim/patches/7.4.300 | |
parent | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (diff) | |
download | current-3152fcc3bbd4cabf01c7e70766a305ce4c725881.tar.gz current-3152fcc3bbd4cabf01c7e70766a305ce4c725881.tar.xz |
Fri May 25 23:29:36 UTC 201814.0
patches/packages/glibc-zoneinfo-2018e-noarch-2_slack14.0.txz: Rebuilt.
Handle removal of US/Pacific-New timezone. If we see that the machine is
using this, it will be automatically switched to US/Pacific.
Diffstat (limited to 'patches/source/vim/patches/7.4.300')
-rw-r--r-- | patches/source/vim/patches/7.4.300 | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/patches/source/vim/patches/7.4.300 b/patches/source/vim/patches/7.4.300 new file mode 100644 index 000000000..308fd9340 --- /dev/null +++ b/patches/source/vim/patches/7.4.300 @@ -0,0 +1,62 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.300 +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.4.300 +Problem: The way config.cache is removed doesn't always work. +Solution: Always remove config.cache. (Ken Takata) +Files: src/Makefile + + +*** ../vim-7.4.299/src/Makefile 2014-04-29 20:04:05.331539784 +0200 +--- src/Makefile 2014-05-22 14:48:23.034475967 +0200 +*************** +*** 1664,1675 **** + # auto/config.h isn't updated. The dependency on auto/config.mk should make + # sure configure is run when it's needed. + # + config auto/config.mk: auto/configure config.mk.in config.h.in +! if test -f auto/config.cache && \ +! grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \ +! ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \ +! rm auto/config.cache; \ +! fi + if test "X$(MAKECMDGOALS)" != "Xclean" \ + -a "X$(MAKECMDGOALS)" != "Xdistclean" \ + -a "X$(MAKECMDGOALS)" != "Xautoconf" \ +--- 1664,1674 ---- + # auto/config.h isn't updated. The dependency on auto/config.mk should make + # sure configure is run when it's needed. + # ++ # Remove the config.cache every time, once in a while it causes problems that ++ # are very hard to figure out. ++ # + config auto/config.mk: auto/configure config.mk.in config.h.in +! -rm -f auto/config.cache + if test "X$(MAKECMDGOALS)" != "Xclean" \ + -a "X$(MAKECMDGOALS)" != "Xdistclean" \ + -a "X$(MAKECMDGOALS)" != "Xautoconf" \ +*** ../vim-7.4.299/src/version.c 2014-05-22 14:44:08.098481148 +0200 +--- src/version.c 2014-05-22 14:51:36.022472045 +0200 +*************** +*** 736,737 **** +--- 736,739 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 300, + /**/ + + +-- +What is the difference between a professional and an amateur? +The ark was built by an amateur; professionals gave us the Titanic. + + /// 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 /// |