Temporarily disable missing llvm apt repo

qgis · Jun 3, 2016 · c8011d9 · c8011d9
1 parent 4c28661
commit c8011d9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
       env:
         - BUILD=qt4
         - QT_VERSION=4
-        - LLVM_VERSION=3.8
+#        - LLVM_VERSION=3.8
       sudo: false
       cache:
         apt: true
@@ -20,12 +20,13 @@ matrix:
         postgresql: "9.4"
         apt:
           sources:
-            - llvm-toolchain-precise-3.8
+#            - llvm-toolchain-precise-3.8
             - ubuntu-toolchain-r-test
             - george-edison55-precise-backports # doxygen 1.8.3
           packages:
             - bison
-            - clang-3.8
+            - gcc-6
+            - g++-6
             - doxygen
             - flex
             - flip
@@ -74,7 +75,7 @@ matrix:
         postgresql: "9.4"
         apt:
           sources:
-            - llvm-toolchain-precise-3.8
+#            - llvm-toolchain-precise-3.8
             - ubuntu-toolchain-r-test
             - george-edison55-precise-backports # doxygen 1.8.3
           packages:
@@ -90,7 +91,8 @@ matrix:
             - txt2tags
             - xvfb
             - flip
-            - clang-3.8
+            - gcc-6
+            - g++-6
     # OSX based build with QT4 and Python 2
     - os: osx
       env:

diff --git a/ci/travis/linux/qt4/install.sh b/ci/travis/linux/qt4/install.sh
@@ -21,15 +21,19 @@ ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERS
 
 ccache -s
 
-export CXX="clang++-${LLVM_VERSION}"
-export CC="clang-${LLVM_VERSION}"
+#export CXX="clang++-${LLVM_VERSION}"
+#export CC="clang-${LLVM_VERSION}"
+export CXX="g++-6"
+export CC="gcc-6"
+
 export PATH=${HOME}/osgeo4travis/bin:${PATH}
 
 cmake --version
 ${CC} --version
 ${CXX} --version
 
-CLANG_WARNINGS="-Wimplicit-fallthrough"
+# CLANG_WARNINGS="-Wimplicit-fallthrough"
+CLANG_WARNINGS=""
 
 cmake -DWITH_SERVER=ON \
       -DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \

diff --git a/ci/travis/linux/qt5/install.sh b/ci/travis/linux/qt5/install.sh
@@ -21,16 +21,19 @@ ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERS
 
 ccache -s
 
-export CXX="clang++-${LLVM_VERSION}"
-export CC="clang-${LLVM_VERSION}"
+#export CXX="clang++-${LLVM_VERSION}"
+#export CC="clang-${LLVM_VERSION}"
+export CXX="g++-6"
+export CC="gcc-6"
 export PATH=${HOME}/osgeo4travis/bin:${PATH}
 export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
 
 cmake --version
 ${CC} --version
 ${CXX} --version
 
-CLANG_WARNINGS="-Wimplicit-fallthrough"
+# CLANG_WARNINGS="-Wimplicit-fallthrough"
+CLANG_WARNINGS=""
 
 # Include this line for debug reasons
 #      -DCMAKE_BUILD_TYPE=RelWithDebInfo \