# HG changeset patch # User Christian Brabandt # Date 1507838404 -7200 # Node ID 53ee2223fb0ae59998a067d5cae5c3c5e0ee6f20 # Parent 082ee475abad70c6f855241d4c3144fee0e8e302 patch 8.0.1187: building with lua fails for OSX on Travis commit https://github.com/vim/vim/commit/8065cf2bfba93a8aeed29f591152edeb0841bff6 Author: Bram Moolenaar Date: Thu Oct 12 21:45:23 2017 +0200 patch 8.0.1187: building with lua fails for OSX on Travis Problem: Building with lua fails for OSX on Travis. Solution: Separate brew-update and brew-install. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/2203) diff --git a/.travis.yml b/.travis.yml --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ before_install: # building cffi only works with gcc, not with clang - if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi # Lua is not installed on Travis OSX - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export HOMEBREW_NO_AUTO_UPDATE=1; brew update; brew install lua; export LUA_PREFIX=/usr/local; fi # Use llvm-cov instead of gcov when compiler is clang. - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "clang" ]; then ln -sf $(which llvm-cov) /home/travis/bin/gcov; fi diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1187, +/**/ 1186, /**/ 1185,