ci/debian: don't use libclc from the system

Debian (unlike Ubuntu) has a broken libclc package missing files we
would very much like to have in our image, so that intel_clc doesn't
fail. Namely :

   /usr/lib/clc/spirv-mesa3d-.spv
   /usr/lib/clc/spirv64-mesa3d-.spv

Dropping libclc from the distribution and build int the build & base
test image.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18788>

diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh
index 012ec18..43fa176 100644 (file)
--- a/.gitlab-ci/container/debian/x86_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_build-base.sh
@@ -38,7 +38,6 @@ apt-get install -y --no-remove \
         kmod \
         libclang-13-dev \
         libclang-11-dev \
-        libclc-dev \
         libelf-dev \
         libepoxy-dev \
         libexpat1-dev \

diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index 0119b79..afcf13d 100644 (file)
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -70,6 +70,8 @@ rm -rf $XORGMACROS_VERSION
 
 . .gitlab-ci/container/build-llvm-spirv.sh
 
+. .gitlab-ci/container/build-libclc.sh
+
 . .gitlab-ci/container/build-libdrm.sh
 
 . .gitlab-ci/container/build-wayland.sh

diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh
index 8811352..55e3d98 100644 (file)
--- a/.gitlab-ci/container/debian/x86_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_test-base.sh
@@ -126,6 +126,10 @@ pip3 install yq
 
 . .gitlab-ci/container/build-llvm-spirv.sh
 
+############### Build libclc
+
+. .gitlab-ci/container/build-libclc.sh
+
 ############### Build libdrm
 
 . .gitlab-ci/container/build-libdrm.sh

diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh
index 4a34a47..7a15842 100644 (file)
--- a/.gitlab-ci/container/debian/x86_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_test-gl.sh
@@ -64,10 +64,6 @@ apt-get install -y --no-remove \
 
 . .gitlab-ci/container/container_pre_build.sh
 
-############### Build libclc
-
-. .gitlab-ci/container/build-libclc.sh
-
 ############### Build piglit
 
 PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index d4f196d..98ee528 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,9 +1,9 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-09-22-llvm-spirv"
+   DEBIAN_BASE_TAG: "2022-09-26-clc"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-09-22-llvm-spirv"
+   DEBIAN_BUILD_TAG: "2022-09-26-clc"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck"
@@ -11,8 +11,8 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-09-22-llvm-spirv"
-   DEBIAN_X86_TEST_VK_TAG: "2022-09-14-add-jq"
+   DEBIAN_X86_TEST_GL_TAG: "2022-09-26-clc"
+   DEBIAN_X86_TEST_VK_TAG: "2022-09-27-clc"
 
    FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
    KERNEL_ROOTFS_TAG: "2022-09-20-wine-lava"