Prefer binay packages over always building form source

LegNeato · LegNeato · commit 6cf09e3b1199 · 2025-07-01T21:28:08.000+02:00
diff --git a/container/rockylinux9-cuda12/Dockerfile b/container/rockylinux9-cuda12/Dockerfile
@@ -35,7 +35,7 @@ RUN dnf -y install epel-release && \
     make && \
     dnf clean all
 
-# Download and build LLVM 7.1.0 for all architectures (consistency)
+# Build LLVM 7.1.0 from source (no packages available for Rocky Linux 9)
 RUN curl -sSf -L -O https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/llvm-7.1.0.src.tar.xz && \
     tar -xf llvm-7.1.0.src.tar.xz && \
     cd llvm-7.1.0.src && \
diff --git a/container/ubuntu22-cuda11/Dockerfile b/container/ubuntu22-cuda11/Dockerfile
@@ -35,36 +35,49 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
     ninja-build && \
     rm -rf /var/lib/apt/lists/*
 
-# Download and build LLVM 7.1.0 for all architectures (consistency)
-RUN curl -sSf -L -O https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/llvm-7.1.0.src.tar.xz && \
-    tar -xf llvm-7.1.0.src.tar.xz && \
-    cd llvm-7.1.0.src && \
-    mkdir build && cd build && \
-    ARCH=$(dpkg --print-architecture) && \
-    if [ "$ARCH" = "amd64" ]; then \
-        TARGETS="X86;NVPTX"; \
+# Download and install LLVM 7 - use pre-built packages where available
+RUN ARCH=$(dpkg --print-architecture) && \
+    # Try to use pre-built packages from Ubuntu 20.04 (they should work on 22.04)
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7_7.0.1-12_${ARCH}.deb && \
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7-dev_7.0.1-12_${ARCH}.deb && \
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/libllvm7_7.0.1-12_${ARCH}.deb && \
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7-runtime_7.0.1-12_${ARCH}.deb && \
+    # Try to install, if it fails, build from source
+    if dpkg -i ./*.deb || apt-get -f install -y; then \
+        ln -s /usr/bin/llvm-config-7 /usr/bin/llvm-config && \
+        rm -rf ./*.deb; \
     else \
-        TARGETS="AArch64;NVPTX"; \
-    fi && \
-    cmake -G Ninja \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DLLVM_TARGETS_TO_BUILD="$TARGETS" \
-        -DLLVM_BUILD_LLVM_DYLIB=ON \
-        -DLLVM_LINK_LLVM_DYLIB=ON \
-        -DLLVM_ENABLE_ASSERTIONS=OFF \
-        -DLLVM_ENABLE_BINDINGS=OFF \
-        -DLLVM_INCLUDE_EXAMPLES=OFF \
-        -DLLVM_INCLUDE_TESTS=OFF \
-        -DLLVM_INCLUDE_BENCHMARKS=OFF \
-        -DLLVM_ENABLE_ZLIB=ON \
-        -DLLVM_ENABLE_TERMINFO=ON \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        .. && \
-    ninja -j$(nproc) && \
-    ninja install && \
-    cd ../.. && \
-    rm -rf llvm-7.1.0.src* && \
-    ln -s /usr/bin/llvm-config /usr/bin/llvm-config-7
+        # If package installation fails, build from source
+        rm -rf ./*.deb && \
+        curl -sSf -L -O https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/llvm-7.1.0.src.tar.xz && \
+        tar -xf llvm-7.1.0.src.tar.xz && \
+        cd llvm-7.1.0.src && \
+        mkdir build && cd build && \
+        if [ "$ARCH" = "amd64" ]; then \
+            TARGETS="X86;NVPTX"; \
+        else \
+            TARGETS="AArch64;NVPTX"; \
+        fi && \
+        cmake -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DLLVM_TARGETS_TO_BUILD="$TARGETS" \
+            -DLLVM_BUILD_LLVM_DYLIB=ON \
+            -DLLVM_LINK_LLVM_DYLIB=ON \
+            -DLLVM_ENABLE_ASSERTIONS=OFF \
+            -DLLVM_ENABLE_BINDINGS=OFF \
+            -DLLVM_INCLUDE_EXAMPLES=OFF \
+            -DLLVM_INCLUDE_TESTS=OFF \
+            -DLLVM_INCLUDE_BENCHMARKS=OFF \
+            -DLLVM_ENABLE_ZLIB=ON \
+            -DLLVM_ENABLE_TERMINFO=ON \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            .. && \
+        ninja -j$(nproc) && \
+        ninja install && \
+        cd ../.. && \
+        rm -rf llvm-7.1.0.src* && \
+        ln -s /usr/bin/llvm-config /usr/bin/llvm-config-7; \
+    fi
 
 # Get Rust
 RUN curl -sSf -L https://sh.rustup.rs | bash -s -- -y
diff --git a/container/ubuntu22-cuda12/Dockerfile b/container/ubuntu22-cuda12/Dockerfile
@@ -35,36 +35,49 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
     ninja-build && \
     rm -rf /var/lib/apt/lists/*
 
-# Download and build LLVM 7.1.0 for all architectures (consistency)
-RUN curl -sSf -L -O https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/llvm-7.1.0.src.tar.xz && \
-    tar -xf llvm-7.1.0.src.tar.xz && \
-    cd llvm-7.1.0.src && \
-    mkdir build && cd build && \
-    ARCH=$(dpkg --print-architecture) && \
-    if [ "$ARCH" = "amd64" ]; then \
-        TARGETS="X86;NVPTX"; \
+# Download and install LLVM 7 - use pre-built packages where available
+RUN ARCH=$(dpkg --print-architecture) && \
+    # Try to use pre-built packages from Ubuntu 20.04 (they should work on 22.04)
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7_7.0.1-12_${ARCH}.deb && \
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7-dev_7.0.1-12_${ARCH}.deb && \
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/libllvm7_7.0.1-12_${ARCH}.deb && \
+    curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7-runtime_7.0.1-12_${ARCH}.deb && \
+    # Try to install, if it fails, build from source
+    if dpkg -i ./*.deb || apt-get -f install -y; then \
+        ln -s /usr/bin/llvm-config-7 /usr/bin/llvm-config && \
+        rm -rf ./*.deb; \
     else \
-        TARGETS="AArch64;NVPTX"; \
-    fi && \
-    cmake -G Ninja \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DLLVM_TARGETS_TO_BUILD="$TARGETS" \
-        -DLLVM_BUILD_LLVM_DYLIB=ON \
-        -DLLVM_LINK_LLVM_DYLIB=ON \
-        -DLLVM_ENABLE_ASSERTIONS=OFF \
-        -DLLVM_ENABLE_BINDINGS=OFF \
-        -DLLVM_INCLUDE_EXAMPLES=OFF \
-        -DLLVM_INCLUDE_TESTS=OFF \
-        -DLLVM_INCLUDE_BENCHMARKS=OFF \
-        -DLLVM_ENABLE_ZLIB=ON \
-        -DLLVM_ENABLE_TERMINFO=ON \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        .. && \
-    ninja -j$(nproc) && \
-    ninja install && \
-    cd ../.. && \
-    rm -rf llvm-7.1.0.src* && \
-    ln -s /usr/bin/llvm-config /usr/bin/llvm-config-7
+        # If package installation fails, build from source
+        rm -rf ./*.deb && \
+        curl -sSf -L -O https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/llvm-7.1.0.src.tar.xz && \
+        tar -xf llvm-7.1.0.src.tar.xz && \
+        cd llvm-7.1.0.src && \
+        mkdir build && cd build && \
+        if [ "$ARCH" = "amd64" ]; then \
+            TARGETS="X86;NVPTX"; \
+        else \
+            TARGETS="AArch64;NVPTX"; \
+        fi && \
+        cmake -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DLLVM_TARGETS_TO_BUILD="$TARGETS" \
+            -DLLVM_BUILD_LLVM_DYLIB=ON \
+            -DLLVM_LINK_LLVM_DYLIB=ON \
+            -DLLVM_ENABLE_ASSERTIONS=OFF \
+            -DLLVM_ENABLE_BINDINGS=OFF \
+            -DLLVM_INCLUDE_EXAMPLES=OFF \
+            -DLLVM_INCLUDE_TESTS=OFF \
+            -DLLVM_INCLUDE_BENCHMARKS=OFF \
+            -DLLVM_ENABLE_ZLIB=ON \
+            -DLLVM_ENABLE_TERMINFO=ON \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            .. && \
+        ninja -j$(nproc) && \
+        ninja install && \
+        cd ../.. && \
+        rm -rf llvm-7.1.0.src* && \
+        ln -s /usr/bin/llvm-config /usr/bin/llvm-config-7; \
+    fi
 
 # Get Rust
 RUN curl -sSf -L https://sh.rustup.rs | bash -s -- -y
diff --git a/container/ubuntu24-cuda12/Dockerfile b/container/ubuntu24-cuda12/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
     ninja-build && \
     rm -rf /var/lib/apt/lists/*
 
-# Download and build LLVM 7.1.0 for all architectures (consistency)
+# Build LLVM 7.1.0 from source (no compatible packages for Ubuntu 24.04)
 RUN curl -sSf -L -O https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/llvm-7.1.0.src.tar.xz && \
     tar -xf llvm-7.1.0.src.tar.xz && \
     cd llvm-7.1.0.src && \
