Upgrade travis docker to xenial, add libb2-dev

Also upgrade clang from 5 to 7, to match travis

Add new deb requirements from libzstd and libb2

diff --git a/.travis/Dockerfile b/.travis/Dockerfile
index eb287ea577885ae970b816f4faefb2ccb2e9882a..43f3429c88fb13eac456385a7038b80adbb1b03d 100644 (file)
--- a/.travis/Dockerfile
+++ b/.travis/Dockerfile
@@ -1,10 +1,10 @@
 # NOTE: This is not the real Docker image used for the Travis builds.
 #       See: https://docs.travis-ci.com/user/common-build-problems/
 
-FROM ubuntu:trusty
+FROM ubuntu:xenial
 
 # https://github.com/Yelp/dumb-init
-ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64.deb .
+ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64.deb .
 RUN dpkg -i dumb-init_*.deb
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 
@@ -20,17 +20,20 @@ RUN apt-get -qq update && apt-get install -y --no-install-recommends \
                 autoconf \
         && rm -rf /var/lib/apt/lists/*
 
-# Travis has upgraded clang, from clang-3.4 to clang-5.0
-# https://github.com/travis-ci/travis-cookbooks/pull/890
-RUN printf "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main\ndeb-src http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main\n# Also add the following for the appropriate libstdc++\ndeb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main\n" > /etc/apt/sources.list.d/llvm-toolchain.list && apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
+# Travis has upgraded clang, from clang-3.8 to clang-7.0
+RUN printf "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main\ndeb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main\n" > /etc/apt/sources.list.d/llvm-toolchain.list && apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
+
 RUN apt-get -qq update && apt-get install -y --no-install-recommends \
-                clang-5.0 \
+                clang-7 \
         && rm -rf /var/lib/apt/lists/* \
-        && ln -s /usr/bin/clang-5.0 /usr/local/bin/clang
+        && ln -s /usr/bin/clang-7 /usr/local/bin/clang
 
 # ccache specific
 RUN apt-get -qq update && apt-get install -y --no-install-recommends \
                 gperf \
                 elfutils \
                 libzstd1-dev \
+                libb2-dev \
+                wget \
+                ca-certificates \
         && rm -rf /var/lib/apt/lists/*

diff --git a/dev.mk.in b/dev.mk.in
index b69eba3360368187fde77647ad1e3458e24e0687..005e6d43fa0679972333c0351670bb9409176561 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -244,6 +244,6 @@ docker: buildenv/$(BUILDENV)/Dockerfile
 travis: .travis/Dockerfile
        $(DOCKER) inspect travis-build >/dev/null || $(DOCKER) build -t travis-build .travis
        $(DOCKER) run --rm --volume $(PWD):/src --tmpfs /dst:rw,exec --env ASAN_OPTIONS='$(ASAN_OPTIONS)' travis-build \
-       sh -c "cd /src && ./autogen.sh && cd /dst && CC=$(CC) CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' /src/configure $(HOST) && make V=$(V) && make V=$(V) $(TEST)"
+       sh -c "cd /src && ./autogen.sh && cd /dst && CC=$(CC) CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' /src/configure $(CONFIGURE) && make V=$(V) && make V=$(V) $(TEST)"
 
 -include .deps/*.d