From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 14 Dec 2017 20:30:22 +0000 (+0000)
Subject: Bump xenial's clang version to 5.0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b00e1cec5ec6140fc4d64ae2b087414432a3fc;p=thirdparty%2Ffreeradius-server.git

Bump xenial's clang version to 5.0
---

diff --git a/scripts/docker/build-ubuntu16/Dockerfile.deps b/scripts/docker/build-ubuntu16/Dockerfile.deps
index a5596eeaf14..ac7842cbaa9 100644
--- a/scripts/docker/build-ubuntu16/Dockerfile.deps
+++ b/scripts/docker/build-ubuntu16/Dockerfile.deps
@@ -6,13 +6,19 @@ RUN apt-get update && apt-get install -y devscripts equivs git quilt
 #  Install GCC-4.9 as it has the requisite support for C11 keywords and atomics
 #
 RUN apt-get install -y software-properties-common python-software-properties
+
+# For GCC-4.9
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test
+
+# For clang-5.0
+RUN add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main"
+RUN apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key
 RUN apt-get update
-RUN apt-get install -y g++-4.9 llvm-3.9 clang-3.9 lldb-3.9
+RUN apt-get install -y g++-4.9 llvm-5.0 clang-5.0 lldb-5.0
 
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 50 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9 && update-alternatives --config gcc
-RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.9 60 && update-alternatives --config clang
-RUN update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-3.9 60 && update-alternatives --config lldb
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-5.0 60 && update-alternatives --config clang
+RUN update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-5.0 60 && update-alternatives --config lldb
 
 #
 #  Install eapol_test dependencies