Skip to content

revert: chore: drop clang and llvm #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ekoops wants to merge 1 commit into
base: master
Choose a base branch
from
Open

revert: chore: drop clang and llvm #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Example_configs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ ARG rh_password

RUN subscription-manager register --username $rh_username --password $rh_password --auto-attach

RUN yum install gcc curl elfutils-libelf-devel kmod make cpio -y
RUN yum install gcc curl elfutils-libelf-devel kmod make \
llvm-toolset-0:12.0.1-1.module+el8.5.0+11871+08d0eab5.x86_64 cpio -y
```

## redhat 9
Expand All @@ -256,7 +257,7 @@ and Dockerfile.rhel9:
```bash
FROM docker.io/redhat/ubi9

RUN yum install gcc elfutils-libelf-devel kmod make cpio -y
RUN yum install gcc elfutils-libelf-devel kmod make cpio llvm-toolset -y
RUN ln -s /usr/bin/$(uname -p)-redhat-linux-gcc-11 /usr/bin/gcc-11
```
The `ln -s /usr/bin/$(uname -p)-redhat-linux-gcc-11 /usr/bin/gcc-11` command creates a symbolic link which makes sure driverkit finds the correct compiler binary.
Expand All @@ -275,7 +276,7 @@ ARG REDHAT_PASSWORD

RUN subscription-manager register --username $REDHAT_USERNAME --password $REDHAT_PASSWORD --auto-attach

RUN yum install gcc elfutils-libelf-devel kmod make cpio -y
RUN yum install gcc elfutils-libelf-devel kmod make cpio llvm-toolset -y
RUN ln -s /usr/bin/$(uname -p)-redhat-linux-gcc-11 /usr/bin/gcc-11
```

Expand Down
2 changes: 2 additions & 0 deletions docker/builders/builder-amazonlinux2-x86_64_gcc10.0.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ LABEL maintainer="cncf-falco-dev@lists.cncf.io"
ARG CMAKE_VERSION

RUN yum -y install gcc10 \
clang \
llvm \
bash-completion \
bc \
ca-certificates \
Expand Down
2 changes: 2 additions & 0 deletions docker/builders/builder-any-x86_64_gcc10.0.0_gcc9.0.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bash-completion \
bc \
clang \
llvm \
ca-certificates \
curl \
dkms \
Expand Down
2 changes: 2 additions & 0 deletions docker/builders/builder-any-x86_64_gcc12.0.0_gcc11.0.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bash-completion \
bc \
clang \
llvm \
ca-certificates \
curl \
dkms \
Expand Down
2 changes: 2 additions & 0 deletions docker/builders/builder-any-x86_64_gcc13.0.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ARG CMAKE_VERSION
RUN dnf install -y \
bash-completion \
bc \
clang \
llvm \
ca-certificates \
curl \
dkms \
Expand Down
2 changes: 2 additions & 0 deletions docker/builders/builder-any-x86_64_gcc14.0.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ARG CMAKE_VERSION
RUN dnf install -y \
bash-completion \
bc \
clang \
llvm \
ca-certificates \
curl \
dkms \
Expand Down
2 changes: 2 additions & 0 deletions docker/builders/builder-any-x86_64_gcc8.0.0_gcc6.0.0_gcc5.0.0_gcc4.9.0_gcc4.8.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bash-completion \
bc \
clang \
llvm \
ca-certificates \
curl \
dkms \
Expand Down
5 changes: 5 additions & 0 deletions docker/builders/builder-centos-x86_64_gcc4.8.5.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo; \
sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo

RUN yum -y install gcc \
llvm-toolset-7.0 \
bash-completion \
bc \
ca-certificates \
Expand Down Expand Up @@ -46,3 +47,7 @@ RUN curl -L -o /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/downl

# Properly create soft link
RUN ln -s /usr/bin/gcc /usr/bin/gcc-4.8.5

RUN source scl_source enable llvm-toolset-7.0
RUN echo "source scl_source enable llvm-toolset-7.0" >> /etc/bashrc
RUN source /etc/bashrc
2 changes: 2 additions & 0 deletions docs/builder.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ The requested gcc version is then [used to find the correct builder image to be

> **NOTE**: when implementing the `builder.GCCVersionRequestor`, returning an empty `semver.Version` means to fallback at default algorithm.

However, there is no mechanism to dynamically choose a clang version, because there should never be any need of touching it.
The build will use the one provided by the chosen builder image.
Any failure must be treated as a bug, and reported on [libs](https://github.com/falcosecurity/libs) repository.

### 5. kernel-crawler
Expand Down
Loading