diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-05-28 17:02:26 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-05-28 18:12:02 +0200 |
| commit | 2b8221d66a8284042fc53c7bbb14bb9750e9137f (patch) | |
| tree | 94ced7fcad0afc093966b7e05e1e109649fc3a60 | |
| parent | 570ec96dbf4f720d8eff694f8c4429e0b0a033b4 (diff) | |
travis: use gcc-5 instead of gcc(-4.9)
The std::put_time and std::get_time introduced in
9febc2b238e1e322dce1f94ecbed46d595893b52 are part of C++11, but not
implemented in GCC until version 5. std::put_time could actually be
worked around via using the facets put() directly, but get() isn't
implemented so that doesn't really help.
We require various tools from wily (which also means we can't build apt
on Debian stable) already, so requiring gcc-5 is just one more instead
of a big step [and an ignoreable change for changelog anyhow].
It also helps in testing what will actually be used (in terms of the
c++11 std ABI) instead of the old ABI.
Git-Dch: Ignore
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index a076d3e4c..2a648c940 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,15 @@ sudo: required dist: trusty before_install: - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - | sudo sh -c '/bin/echo -e "Package: *\nPin: release n=wily\nPin-Priority: 1" > /etc/apt/preferences.d/wily' - sudo apt-get update -qq install: - sudo ./prepare-release travis-ci - sudo apt-get -qq -y -t wily install gettext liblz4-dev python3-apt - - make + - sudo apt-get -qq -y install gcc-5 g++-5 + - CC=gcc-5 CXX=g++-5 make script: - make test - ./test/integration/run-tests -q |