Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ag-ohlberger
dune-community
docker
Commits
42b39e1e
Unverified
Commit
42b39e1e
authored
2 years ago
by
René Fritze
Browse files
Options
Downloads
Patches
Plain Diff
[debian] switch to clang from llvm apt repo
parent
4180ab15
No related branches found
Branches containing commit
No related tags found
1 merge request
!128
Clang apt
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/include/full
+7
-2
7 additions, 2 deletions
debian/include/full
debian/include/interactive
+5
-3
5 additions, 3 deletions
debian/include/interactive
debian/include/stable-minimal
+1
-1
1 addition, 1 deletion
debian/include/stable-minimal
with
13 additions
and
6 deletions
debian/include/full
+
7
−
2
View file @
42b39e1e
...
@@ -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 && \
...
...
This diff is collapsed.
Click to expand it.
debian/include/interactive
+
5
−
3
View file @
42b39e1e
...
@@ -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 && \
...
...
This diff is collapsed.
Click to expand it.
debian/include/stable-minimal
+
1
−
1
View file @
42b39e1e
...
@@ -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=1
3
\
CLANG_VERSION=1
5
\
GCC_VERSION=10 \
GCC_VERSION=10 \
CLANG_PYTHON_PACKAGE=python3-clang \
CLANG_PYTHON_PACKAGE=python3-clang \
DXT_DOCKER=1 \
DXT_DOCKER=1 \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment