From cf4a51c81975e2b6732a2ec90b13650ab43dec9d Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Mon, 6 Jun 2016 17:21:29 -0700
Subject: [PATCH 1/2] Try to use Mason builds for clang

---
 .travis.yml | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08b217f6..6b951d48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,27 +7,27 @@ matrix:
     # debug+integer-santizer build
     - os: linux
       compiler: clang
-      env: BUILDTYPE=Debug CC="clang-3.5" CXX="clang++-3.5" CXXFLAGS="-fsanitize=integer" CFLAGS="-fsanitize=integer" LDFLAGS="-fsanitize=integer"
+      env: CLANG_VERSION='3.8.0' BUILDTYPE=Debug CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="-fsanitize=integer" CFLAGS="-fsanitize=integer" LDFLAGS="-fsanitize=integer"
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
-          packages: [ 'clang-3.5', 'llvm-3.5-dev' ]
+          sources: ['ubuntu-toolchain-r-test' ]
+          packages: [ ]
     # debug+leak+address-sanitizer build
     - os: linux
       compiler: clang
-      env: BUILDTYPE=Debug ASAN_OPTIONS=detect_leaks=1 CC="clang-3.5" CXX="clang++-3.5" CXXFLAGS="-fsanitize=address" CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address"
+      env: CLANG_VERSION='3.8.0' BUILDTYPE=Debug ASAN_OPTIONS=detect_leaks=1 CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="-fsanitize=address" CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address"
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
-          packages: [ 'clang-3.5', 'llvm-3.5-dev' ]
+          sources: ['ubuntu-toolchain-r-test' ]
+          packages: [ ]
     # coverage+debug build
     - os: linux
       compiler: clang
-      env: BUILDTYPE=Debug CC="clang-3.5" CXX="clang++-3.5" CXXFLAGS="--coverage" CFLAGS="--coverage" LDFLAGS="--coverage"
+      env: CLANG_VERSION='3.8.0' BUILDTYPE=Debug CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="--coverage" CFLAGS="--coverage" LDFLAGS="--coverage"
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
-          packages: [ 'clang-3.5', 'llvm-3.5-dev' ]
+          sources: ['ubuntu-toolchain-r-test' ]
+          packages: [ ]
     # release+linux+g++
     - os: linux
       compiler: gcc
@@ -39,11 +39,11 @@ matrix:
     # release+linux+clang++
     - os: linux
       compiler: clang
-      env: BUILDTYPE=Release CC="clang-3.5" CXX="clang++-3.5"
+      env: CLANG_VERSION='3.8.0' BUILDTYPE=Release CC="clang-3.8" CXX="clang++-3.8"
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
-          packages: [ 'clang-3.5' ]
+          sources: ['ubuntu-toolchain-r-test' ]
+          packages: [ 'clang-3.8' ]
     # release+osx
     - os: osx
       compiler: clang
@@ -53,6 +53,16 @@ matrix:
       compiler: clang
       env: BUILDTYPE=Debug
 
+before_install:
+  - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
+  - export PATH=${DEPS_DIR}/bin:${PATH} && mkdir -p ${DEPS_DIR}
+  - |
+    if [[ ${CLANG_VERSION:-false} != false ]]; then
+      export CCOMPILER='clang'
+      export CXXCOMPILER='clang++'
+      CLANG_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/clang/${CLANG_VERSION}.tar.gz"
+      travis_retry wget --quiet -O - ${CLANG_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}
+    fi
 
 install:
  - BUILDTYPE=${BUILDTYPE} make -j

From d18f93df4cbda7cb77f2852a8ba9d7a77d1e06ff Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Mon, 6 Jun 2016 17:27:32 -0700
Subject: [PATCH 2/2] Add libstdc++ packages

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b951d48..6361da25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test' ]
-          packages: [ ]
+          packages: [ 'libstdc++6','libstdc++-5-dev' ]
     # debug+leak+address-sanitizer build
     - os: linux
       compiler: clang
@@ -19,7 +19,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test' ]
-          packages: [ ]
+          packages: [ 'libstdc++6','libstdc++-5-dev' ]
     # coverage+debug build
     - os: linux
       compiler: clang
@@ -27,7 +27,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test' ]
-          packages: [ ]
+          packages: [ 'libstdc++6','libstdc++-5-dev' ]
     # release+linux+g++
     - os: linux
       compiler: gcc
@@ -43,7 +43,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test' ]
-          packages: [ 'clang-3.8' ]
+          packages: [ 'libstdc++6','libstdc++-5-dev' ]
     # release+osx
     - os: osx
       compiler: clang