From 26037f4ccb9b18c98581b419bee8524a19721619 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 25 Jul 2015 12:30:02 +0200 Subject: [PATCH] Get g++-4.7 from a PPA on travis. --- .travis.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 364c1450db..b27fbd7cba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,19 @@ language: cpp compiler: - gcc -# - clang # does not work for us on debian stable (boost is too old there) -before_install: + - clang +addons: + apt: # Get recent versions of the compiler, even on Ubuntu Precise + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.7 + - g++-4.7 + - clang +# Still need sudo to get the recent version of gcc actually used +before_install: - sudo apt-get update -qq - - sudo apt-get install -y g++-4.7 gcc-4.7 cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-dev libboost-all-dev libns3-dev ns3 + - sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-dev libboost-all-dev libns3-dev ns3 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 script: -- 2.20.1