From: Arran Cudbard-Bell Date: Fri, 15 Dec 2017 12:55:23 +0000 (+0000) Subject: Bump clang other docker images to clang 5.0 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e718cc75e140d46bc20d8f7e1583a829c5cc077;p=thirdparty%2Ffreeradius-server.git Bump clang other docker images to clang 5.0 --- diff --git a/scripts/docker/build-debian8/Dockerfile.deps b/scripts/docker/build-debian8/Dockerfile.deps index 22717df09dd..545d6c55f45 100644 --- a/scripts/docker/build-debian8/Dockerfile.deps +++ b/scripts/docker/build-debian8/Dockerfile.deps @@ -1,13 +1,24 @@ FROM debian:jessie -RUN apt-get update && apt-get install -y devscripts equivs git quilt +RUN apt-get update && apt-get install -y devscripts equivs git quilt software-properties-common python-software-properties # -# Install GCC-4.9 as it has the requisite support for C11 keywords and atomics +# For GCC 4.9 # RUN apt-get install -y g++-4.9 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 +# +# For clang 5.0 +# +RUN add-apt-repository "http://apt.llvm.org/jessie/ llvm-toolchain-jessie-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 llvm-5.0 clang-5.0 lldb-5.0 + +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 # diff --git a/scripts/docker/build-debian9/Dockerfile.deps b/scripts/docker/build-debian9/Dockerfile.deps index 407a85f874a..bd6f01967aa 100644 --- a/scripts/docker/build-debian9/Dockerfile.deps +++ b/scripts/docker/build-debian9/Dockerfile.deps @@ -1,11 +1,22 @@ FROM debian:stretch -RUN apt-get update && apt-get install -y devscripts equivs git quilt +RUN apt-get update && apt-get install -y devscripts equivs git quilt software-properties-common python-software-properties # -# Stretch uses gcc4.9 by default, so we don't need to install any additional compilers to get C11 functionality +# Stretch uses GCC 4.9 by default, so we don't need to install any additional compilers to get C11 functionality # +# +# For clang 5.0 +# +RUN add-apt-repository "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-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 llvm-5.0 clang-5.0 lldb-5.0 + +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 # diff --git a/scripts/docker/build-ubuntu14/Dockerfile.deps b/scripts/docker/build-ubuntu14/Dockerfile.deps index 6bb82ecf917..d7fab242df0 100644 --- a/scripts/docker/build-ubuntu14/Dockerfile.deps +++ b/scripts/docker/build-ubuntu14/Dockerfile.deps @@ -1,22 +1,23 @@ FROM ubuntu:14.04 -RUN apt-get update && apt-get install -y devscripts equivs git quilt +RUN apt-get update && apt-get install -y devscripts equivs git quilt software-properties-common python-software-properties # -# Install GCC-4.9 as it has the requisite support for C11 keywords and atomics +# For GCC 4.9 # -RUN apt-get install -y software-properties-common python-software-properties - -# For GCC-4.9 RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get update +RUN apt-get install -y g++-4.9 +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 -# For clang-5.0 +# +# For Clang 5.0 +# RUN add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trust-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-5.0 clang-5.0 lldb-5.0 +RUN apt-get install -y 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-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 diff --git a/scripts/docker/build-ubuntu16/Dockerfile.deps b/scripts/docker/build-ubuntu16/Dockerfile.deps index ac7842cbaa9..088e6332eed 100644 --- a/scripts/docker/build-ubuntu16/Dockerfile.deps +++ b/scripts/docker/build-ubuntu16/Dockerfile.deps @@ -1,22 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y devscripts equivs git quilt +RUN apt-get update && apt-get install -y devscripts equivs git quilt software-properties-common python-software-properties # -# Install GCC-4.9 as it has the requisite support for C11 keywords and atomics +# For GCC 4.9 # -RUN apt-get install -y software-properties-common python-software-properties - -# For GCC-4.9 RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get update +RUN apt-get install -y g++-4.9 +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 -# For clang-5.0 +# +# 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-5.0 clang-5.0 lldb-5.0 +RUN apt-get install -y 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-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