From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 25 Jul 2015 10:30:02 +0000 (+0200)
Subject: Get g++-4.7 from a PPA on travis.
X-Git-Tag: v3_12~411
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/26037f4ccb9b18c98581b419bee8524a19721619?hp=8614314e15433c18f67638fdcb519a12608e49c2

Get g++-4.7 from a PPA on travis.
---

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: