Skip to content
Snippets Groups Projects
Unverified Commit 42b39e1e authored by René Fritze's avatar René Fritze
Browse files

[debian] switch to clang from llvm apt repo

parent 4180ab15
No related branches found
No related tags found
1 merge request!128Clang apt
...@@ -9,12 +9,17 @@ ENV DEBIAN_FRONTEND=noninteractive \ ...@@ -9,12 +9,17 @@ ENV DEBIAN_FRONTEND=noninteractive \
# CLANG_FORMAT is defined as a commonly available version # CLANG_FORMAT is defined as a commonly available version
RUN APT_UPDATE APT_REDIRECT && \ RUN APT_UPDATE APT_REDIRECT && \
APT_INSTALL WITH_BACKPORTS libglu1-mesa libqt5x11extras5 && \ APT_INSTALL WITH_BACKPORTS libglu1-mesa libqt5x11extras5 && \
APT_INSTALL doxygen LIBCPP_DEV clang-${CLANG_VERSION} \ APT_INSTALL doxygen LIBCPP_DEV \
libeigen3-dev libscotchmetis-dev libscotchparmetis-dev libsuitesparse-dev \ libeigen3-dev libscotchmetis-dev libscotchparmetis-dev libsuitesparse-dev \
libmumps-scotch-dev ${CLANG_PYTHON_PACKAGE}-${CLANG_VERSION} lcov curl \ libmumps-scotch-dev lcov curl \
ninja-build libopenmpi-dev openmpi-common openmpi-bin \ ninja-build libopenmpi-dev openmpi-common openmpi-bin \
lsb-release wget software-properties-common gnupg \
doxygen python3-pip python3-requests doxygen-latex python3-setuptools \ doxygen python3-pip python3-requests doxygen-latex python3-setuptools \
valgrind-mpi LIBLAPACKE_DEV ssh numactl libtcmalloc-minimal4 google-perftools APT_REDIRECT && \ valgrind-mpi LIBLAPACKE_DEV ssh numactl libtcmalloc-minimal4 google-perftools APT_REDIRECT && \
wget https://apt.llvm.org/llvm.sh && \
chmod +x llvm.sh && \
./llvm.sh ${CLANG_VERSION}
RUN \
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 100 && \ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 100 && \
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 100 && \ update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 100 && \
apt-get autoremove -y && \ apt-get autoremove -y && \
......
...@@ -16,12 +16,14 @@ ENV NVIDIA_DRIVER_CAPABILITIES \ ...@@ -16,12 +16,14 @@ ENV NVIDIA_DRIVER_CAPABILITIES \
RUN APT_UPDATE APT_REDIRECT && \ RUN APT_UPDATE APT_REDIRECT && \
APT_INSTALL \ APT_INSTALL \
bash-completion ccache libc++1 libclang-${CLANG_VERSION}-dev \ bash-completion ccache libc++1 ninja-build \
llvm-${CLANG_VERSION} clang-${CLANG_VERSION} \ lsb-release wget software-properties-common gnupg \
ninja-build \
libstdc++6-${GCC_VERSION}-dbg \ libstdc++6-${GCC_VERSION}-dbg \
ack git time valgrind vim-nox wget build-essential cmake \ ack git time valgrind vim-nox wget build-essential cmake \
less libnotify-bin openssh-server APT_REDIRECT && \ less libnotify-bin openssh-server APT_REDIRECT && \
wget https://apt.llvm.org/llvm.sh && \
chmod +x llvm.sh && \
./llvm.sh ${CLANG_VERSION} && \
echo ' . /usr/share/bash-completion/bash_completion ' >> /etc/bash.bashrc && \ echo ' . /usr/share/bash-completion/bash_completion ' >> /etc/bash.bashrc && \
mkdir -p /home/user/.ccache && \ mkdir -p /home/user/.ccache && \
echo "max_size = 5.0G" > /home/user/.ccache/ccache.conf && \ echo "max_size = 5.0G" > /home/user/.ccache/ccache.conf && \
......
...@@ -5,7 +5,7 @@ FROM debian:bullseye-20221004-slim ...@@ -5,7 +5,7 @@ FROM debian:bullseye-20221004-slim
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
DXT_ENVIRONMENT=debian-minimal \ DXT_ENVIRONMENT=debian-minimal \
CLANG_VERSION=13 \ CLANG_VERSION=15 \
GCC_VERSION=10 \ GCC_VERSION=10 \
CLANG_PYTHON_PACKAGE=python3-clang \ CLANG_PYTHON_PACKAGE=python3-clang \
DXT_DOCKER=1 \ DXT_DOCKER=1 \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment