From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 13 Feb 2018 15:25:46 +0000 (+0100)
Subject: Revert "travis: Use Clang 4.0 instead of 3.9 due to va_start() warnings"
X-Git-Tag: 5.6.2rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26e033cfe3f0664b47d814f827ae5834c9cd5ade;p=thirdparty%2Fstrongswan.git

Revert "travis: Use Clang 4.0 instead of 3.9 due to va_start() warnings"

The Trusty image used by Travis was updated in December and now has Clang
5.0.0 installed.  So this workaround is not necessary anymore.

This reverts commit f4bd46764143744202b817cf7268aa9e6f4ab5f7.
---

diff --git a/.travis.yml b/.travis.yml
index 35c9932f77..a17f242d1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,19 +10,6 @@ compiler:
 before_install:
   - ./scripts/test.sh deps
   - ./scripts/test.sh pydeps
-  # use clang 4.0 instead of 3.9 due to unnecessary va_start() warnings
-  - echo $TRAVIS_OS_NAME
-  - echo $CC
-  - echo $(clang --version)
-  - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "clang" ]; then
-      if [[ "$(clang --version)" =~ 3\.9\.[0-9] ]]; then
-        curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -;
-        echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main" | sudo tee -a /etc/apt/sources.list;
-        sudo apt-get update -qq;
-        sudo apt-get install -qq clang-4.0;
-        CC=clang-4.0;
-      fi;
-    fi
 
 before_script:
   - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 || true