diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-07-04 14:58:14 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-07-04 14:58:14 +0200 |
| commit | f648a20360c87d42d9ba05745f70cc08267a4dd2 (patch) | |
| tree | 8348b4c6cd675b174de136cf4646104c85349942 | |
| parent | 2a1283e97c8039145e1b11cc57b4aa223f4ae58e (diff) | |
| download | curl-bagder/travis-install-nghttp2-linux.tar.gz | |
travis: move the apt installs to 'packages', pass CXX to configurebagder/travis-install-nghttp2-linux
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 619368b18..58205dad2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ addons: - lcov - clang-3.7 - valgrind + - libev-dev + - libc-ares-dev + - g++-4.8 + - libstdc++-4.8-dev matrix: include: @@ -47,11 +51,9 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew reinstall libtool > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl libidn rtmpdump libssh2 c-ares libmetalink libressl nghttp2; fi - if [ $TRAVIS_OS_NAME = linux ]; then - sudo apt-get install -qq libev-dev libc-ares-dev g++-4.8 libstdc++-4.8-dev; - export CXX="g++-4.8"; curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | tar xzf - && - (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); + (cd nghttp2-1.24.0 && CXX="g++-4.8" ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); fi before_script: |