Bump LLVM to 22

This commit is contained in:
Stenzek
2026-06-20 12:34:41 +10:00
parent 4cb59d60e6
commit 703b82216b
4 changed files with 12 additions and 12 deletions
+4 -4
View File
@@ -25,11 +25,11 @@ RUN echo 'APT::Install-Suggests "0";' >> /etc/apt/apt.conf.d/00-docker && \
# Update cmake, 22.04 is too old.
COPY hashes.txt /tmp
RUN cd /tmp && \
curl -LO https://github.com/Kitware/CMake/releases/download/v4.3.2/cmake-4.3.2-linux-x86_64.sh && \
curl -LO https://github.com/Kitware/CMake/releases/download/v4.3.4/cmake-4.3.4-linux-x86_64.sh && \
sha256sum -c hashes.txt && \
chmod +x cmake-4.3.2-linux-x86_64.sh && \
./cmake-4.3.2-linux-x86_64.sh --prefix=/usr/local --skip-license && \
rm cmake-4.3.2-linux-x86_64.sh
chmod +x cmake-4.3.4-linux-x86_64.sh && \
./cmake-4.3.4-linux-x86_64.sh --prefix=/usr/local --skip-license && \
rm cmake-4.3.4-linux-x86_64.sh
# Create directory for Android SDK
RUN mkdir -p ${ANDROID_HOME}
+1 -1
View File
@@ -1,2 +1,2 @@
ee0b34a9a55a0d6220eceed0eab44047bbdbdc40fae0a89ba41635548a673fac cmake-4.3.2-linux-x86_64.sh
b0b61ae426a0d1130642a3287eb5c7f5ef6f88966fd42e2aed9656ec69d42415 cmake-4.3.4-linux-x86_64.sh
+6 -6
View File
@@ -13,17 +13,17 @@ COPY hashes.txt /tmp
RUN apt-get update && \
apt-get install -y curl gnupg && \
curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
echo 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main' > /etc/apt/sources.list.d/llvm.list && \
echo 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-22 main' > /etc/apt/sources.list.d/llvm.list && \
apt-get update && \
apt-get install -y --no-install-recommends autoconf automake build-essential clang-20 curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfuse2 libgtk-3-dev libgudev-1.0-dev libharfbuzz-dev libinput-dev libopengl-dev libpipewire-0.3-dev libpulse-dev libssl-dev libudev-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev libxss-dev libtool lld-20 llvm-20 ninja-build patchelf pkg-config unzip zlib1g-dev libegl1-mesa-dev libdrm-dev libgbm-dev appstream "g++-${CROSS_TRIPLET}" debootstrap binfmt-support qemu-user-static && \
apt-get install -y --no-install-recommends autoconf automake build-essential clang-22 curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfuse2 libgtk-3-dev libgudev-1.0-dev libharfbuzz-dev libinput-dev libopengl-dev libpipewire-0.3-dev libpulse-dev libssl-dev libudev-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev libxss-dev libtool lld-22 llvm-22 ninja-build patchelf pkg-config unzip zlib1g-dev libegl1-mesa-dev libdrm-dev libgbm-dev appstream "g++-${CROSS_TRIPLET}" debootstrap binfmt-support qemu-user-static && \
rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
# Update cmake, 22.04 is too old.
RUN curl -LO https://github.com/Kitware/CMake/releases/download/v4.3.2/cmake-4.3.2-linux-x86_64.sh && \
RUN curl -LO https://github.com/Kitware/CMake/releases/download/v4.3.4/cmake-4.3.4-linux-x86_64.sh && \
sha256sum -c hashes.txt && \
chmod +x cmake-4.3.2-linux-x86_64.sh && \
./cmake-4.3.2-linux-x86_64.sh --prefix=/usr/local --skip-license && \
rm cmake-4.3.2-linux-x86_64.sh
chmod +x cmake-4.3.4-linux-x86_64.sh && \
./cmake-4.3.4-linux-x86_64.sh --prefix=/usr/local --skip-license && \
rm cmake-4.3.4-linux-x86_64.sh
# Create chroot.
RUN debootstrap --arch="${CROSS_ARCH}" jammy "/$CROSS_ARCH-chroot" && \
+1 -1
View File
@@ -1,2 +1,2 @@
ee0b34a9a55a0d6220eceed0eab44047bbdbdc40fae0a89ba41635548a673fac cmake-4.3.2-linux-x86_64.sh
b0b61ae426a0d1130642a3287eb5c7f5ef6f88966fd42e2aed9656ec69d42415 cmake-4.3.4-linux-x86_64.sh