summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2017-02-05 04:17:14 +0200
committerOleg Oshmyan <chortos@inbox.lv>2017-02-05 20:45:31 +0200
commitb0a00c96071e4300277955a77c2998d7f4db686d (patch)
treeb3e00cdacbae9d5579c992376149e58b36f10a95
parent0ae1cbdb5753cc3f6e5bd13ca49756d7c44948ea (diff)
downloadlibass-b0a00c96071e4300277955a77c2998d7f4db686d.tar.bz2
libass-b0a00c96071e4300277955a77c2998d7f4db686d.tar.xz
Travis CI: remove libtool reinstall hack on OS X
The problem was fixed in Homebrew in libtool 2.4.6_1: https://github.com/Homebrew/homebrew-core/commit/712f737a7f64f0fd905357c3765cdce0821a4af2 Since https://blog.travis-ci.com/2016-10-04-osx-73-default-image-live/, this libtool comes preinstalled on Travis CI, thus the hack is no longer needed. Homebrew bug report possibly relevant to the original problem: https://github.com/Homebrew/legacy-homebrew/issues/43874
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index f18d410..6f093cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ branches:
before_install:
- (sudo apt-get update || brew update)
- - (sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libfribidi-dev yasm || (brew uninstall libtool; brew install freetype fribidi libtool yasm)) && ./autogen.sh && ./configure
+ - (sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libfribidi-dev yasm || brew install freetype fribidi yasm) && ./autogen.sh && ./configure
script:
- make -j4