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

ci: move from pkg-config to pkgconf

Browse Source 
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21977>
This commit is contained in:
David Heidelberg
2023-03-16 18:05:35 +01:00
parent 394d592525
commit bb54ae1d26
10 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/container/create-android-cross-file.sh
View File

@@ -22,7 +22,7 @@ cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_v
c_ld = 'lld'
cpp_ld = 'lld'
strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
pkgconfig = ['/usr/bin/pkg-config']
pkgconfig = ['/usr/bin/pkgconf']
[host_machine]
system = 'android'

2
.gitlab-ci/container/create-cross-file.sh
View File

@@ -47,7 +47,7 @@ if [[ -n "$GCC_ARCH" ]]; then
echo "set(CMAKE_SYSTEM_PROCESSOR arm)";
echo "set(CMAKE_C_COMPILER /usr/lib/ccache/$GCC_ARCH-gcc)";
echo "set(CMAKE_CXX_COMPILER /usr/lib/ccache/$GCC_ARCH-g++)";
echo "set(ENV{PKG_CONFIG} \"/usr/bin/$GCC_ARCH-pkg-config\")";
echo "set(ENV{PKG_CONFIG} \"/usr/bin/$GCC_ARCH-pkgconf\")";
echo "set(DE_CPU $DE_CPU)";
} > "$toolchain_file"
fi

3
.gitlab-ci/container/cross_build.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# shellcheck disable=SC2086 # we want word splitting
set -e
@@ -17,6 +17,7 @@ apt-get install -y --no-remove \
$STABLE_EPHEMERAL \
curl \
crossbuild-essential-$arch \
pkgconf:$arch \
libelf-dev:$arch \
libexpat1-dev:$arch \
libffi-dev:$arch \

2
.gitlab-ci/container/debian/arm_build.sh
View File

@@ -54,7 +54,7 @@ apt-get -y install \
libwayland-dev \
llvm-11-dev \
ninja-build \
pkg-config \
pkgconf \
python3-mako \
python3-pil \
python3-pip \

2
.gitlab-ci/container/debian/x86_build-base.sh
View File

@@ -62,7 +62,7 @@ apt-get install -y --no-remove \
libxxf86vm-dev \
make \
ninja-build \
pkg-config \
pkgconf \
python3-mako \
python3-pil \
python3-ply \

2
.gitlab-ci/container/debian/x86_mingw-toolchain.cmake
View File

@@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(CMAKE_SYSROOT /usr/x86_64-w64-mingw32/)
set(ENV{PKG_CONFIG} /usr/x86_64-w64-mingw32/bin/pkg-config)
set(ENV{PKG_CONFIG} /usr/x86_64-w64-mingw32/bin/pkgconf)
set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)

2
.gitlab-ci/container/debian/x86_test-base.sh
View File

@@ -41,7 +41,7 @@ STABLE_EPHEMERAL=" \
make \
meson \
patch \
pkg-config \
pkgconf \
protobuf-compiler \
python3-dev \
python3-pip \

2
.gitlab-ci/container/debian/x86_test-gl.sh
View File

@@ -37,7 +37,7 @@ STABLE_EPHEMERAL=" \
meson \
ocl-icd-opencl-dev \
patch \
pkg-config \
pkgconf \
python3-distutils \
xz-utils \
"

2
.gitlab-ci/container/debian/x86_test-vk.sh
View File

@@ -38,7 +38,7 @@ STABLE_EPHEMERAL=" \
mingw-w64-x86-64-dev \
p7zip \
patch \
pkg-config \
pkgconf \
python3-dev \
python3-distutils \
python3-pip \

2
.gitlab-ci/x86_64-w64-mingw32
View File

@@ -3,7 +3,7 @@ c = ['ccache', 'x86_64-w64-mingw32-gcc-posix']
cpp = ['ccache', 'x86_64-w64-mingw32-g++-posix']
ar = 'x86_64-w64-mingw32-ar'
strip = 'x86_64-w64-mingw32-strip'
pkgconfig = '/usr/x86_64-w64-mingw32/bin/pkg-config'
pkgconfig = '/usr/x86_64-w64-mingw32/bin/pkgconf'
llvm-config = '/usr/x86_64-w64-mingw32/bin/llvm-config'
windres = 'x86_64-w64-mingw32-windres'
exe_wrapper = ['wine64']