OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Make sure to install libraries in the right directory on debian

Browse Source 
Meson is using dpkg-architecture to guess the right triplet for the lib directory
make sure to have it installed (from dpkg-dev) to always use the right directory.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30015>
This commit is contained in:
Corentin Noël
2024-07-03 14:52:24 +02:00
committed by Marge Bot
parent 0b09cf63a8
commit 6aec920bbe
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci/container/debian/test-base.sh
View File

@@ -28,6 +28,7 @@ EPHEMERAL=(
ccache ccache
cmake cmake
"clang-${LLVM_VERSION}" "clang-${LLVM_VERSION}"
dpkg-dev
flex flex
glslang-tools glslang-tools
g++ g++

1
.gitlab-ci/container/debian/test-gl.sh
View File

@@ -15,6 +15,7 @@ EPHEMERAL=(
ccache ccache
"clang-${LLVM_VERSION}" "clang-${LLVM_VERSION}"
cmake cmake
dpkg-dev
g++ g++
glslang-tools glslang-tools
libasound2-dev libasound2-dev

1
.gitlab-ci/container/debian/test-vk.sh
View File

@@ -14,6 +14,7 @@ apt-get install -y libelogind0 # this interfere with systemd deps, install sepa
EPHEMERAL=( EPHEMERAL=(
ccache ccache
cmake cmake
dpkg-dev
g++ g++
glslang-tools glslang-tools
libexpat1-dev libexpat1-dev

1
.gitlab-ci/container/debian/x86_64_build-base.sh
View File

@@ -28,6 +28,7 @@ DEPS=(
"clang-${LLVM_VERSION}" "clang-${LLVM_VERSION}"
"clang-format-${LLVM_VERSION}" "clang-format-${LLVM_VERSION}"
dpkg-cross dpkg-cross
dpkg-dev
findutils findutils
flex flex
flatbuffers-compiler flatbuffers-compiler

8
.gitlab-ci/image-tags.yml
View File

@@ -13,10 +13,10 @@
variables: variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "20240612-mold" DEBIAN_BASE_TAG: "20240704-libdir"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "20240612-mold" DEBIAN_BUILD_TAG: "20240704-libdir"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base" DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
@@ -28,8 +28,8 @@ variables:
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20240423-deqp" DEBIAN_TEST_ANDROID_TAG: "20240423-deqp"
DEBIAN_TEST_GL_TAG: "20240703-vvl" DEBIAN_TEST_GL_TAG: "20240704-libdir"
DEBIAN_TEST_VK_TAG: "20240703-vkd3d" DEBIAN_TEST_VK_TAG: "20240704-libdir"
KERNEL_ROOTFS_TAG: "20240703-vvl" KERNEL_ROOTFS_TAG: "20240703-vvl"
ALPINE_X86_64_BUILD_TAG: "20240620-sphinx" ALPINE_X86_64_BUILD_TAG: "20240620-sphinx"