From cfc6566d5097ef5518e12f5c1e5f15a8f5b182cf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 29 Jun 2016 11:00:04 +0200
Subject: Revert "travis: use gcc-5 instead of gcc(-4.8)"

This reverts commit 2b8221d66a8284042fc53c7bbb14bb9750e9137f.

Avoiding the use of GCC >= 5 stuff lets use go back to 4.8 simplifying
the travis setup again as well as reducing the backport requirements in
general.

This is possible because the std::get_time use requiring GCC >= 5 in
9febc2b238e1e322dce1f94ecbed46d595893b52 was replaced by handrolling it
in 1d742e01470bba27715a8191c50adde4b39c2f19, so the remaining uses are
just small conviniences we can do without.

Gbp-Dch: Ignore
---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2a648c940..a076d3e4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,13 @@ 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
- - sudo apt-get -qq -y install gcc-5 g++-5
- - CC=gcc-5 CXX=g++-5 make
+ - make
 script:
  - make test
  - ./test/integration/run-tests -q
-- 
cgit v1.2.3