From 70515de4890c0f9d81dc6d7a7531c5a40ded5a9d Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Fri, 24 May 2024 20:52:16 -0700 Subject: [PATCH] ci/arm64: rustify the build Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/debian/arm64_build.sh | 28 ++++++++++++++++++++++ .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh index 4f34532b7fa..70bce5f9dfa 100644 --- a/.gitlab-ci/container/debian/arm64_build.sh +++ b/.gitlab-ci/container/debian/arm64_build.sh @@ -26,6 +26,7 @@ DEPS=( ccache cmake curl + "clang-${LLVM_VERSION}" fastboot flatbuffers-compiler flex @@ -33,11 +34,15 @@ DEPS=( git glslang-tools kmod + "libclang-${LLVM_VERSION}-dev" + "libclang-cpp${LLVM_VERSION}-dev" + "libclang-common-${LLVM_VERSION}-dev" libasan8 libdrm-dev libelf-dev libexpat1-dev libflatbuffers-dev + "libllvm${LLVM_VERSION}" libvulkan-dev libx11-dev libx11-xcb-dev @@ -86,6 +91,29 @@ arch=armhf . .gitlab-ci/container/build-wayland.sh +. .gitlab-ci/container/build-llvm-spirv.sh + +. .gitlab-ci/container/build-libclc.sh + +# We need at least 1.4.0 for rusticl +pip3 install --break-system-packages 'meson==1.4.0' + +. .gitlab-ci/container/build-rust.sh + +# install bindgen +RUSTFLAGS='-L native=/usr/local/lib' cargo install \ + bindgen-cli --version 0.65.1 \ + --locked \ + -j ${FDO_CI_CONCURRENT:-4} \ + --root /usr/local + +# install cbindgen +RUSTFLAGS='-L native=/usr/local/lib' cargo install \ + cbindgen --version 0.26.0 \ + --locked \ + -j ${FDO_CI_CONCURRENT:-4} \ + --root /usr/local + apt-get purge -y "${EPHEMERAL[@]}" . .gitlab-ci/container/container_post_build.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index a97fbf7df38..65bc175536d 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,7 +13,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "20240516-rename-arm" + DEBIAN_BASE_TAG: "20240529-rust" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "20240529-pkg-config"