From bb54ae1d26d2407f176f007fb600ec3ec97b71e7 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Thu, 16 Mar 2023 18:05:35 +0100 Subject: [PATCH] ci: move from pkg-config to pkgconf Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/create-android-cross-file.sh | 2 +- .gitlab-ci/container/create-cross-file.sh | 2 +- .gitlab-ci/container/cross_build.sh | 3 ++- .gitlab-ci/container/debian/arm_build.sh | 2 +- .gitlab-ci/container/debian/x86_build-base.sh | 2 +- .gitlab-ci/container/debian/x86_mingw-toolchain.cmake | 2 +- .gitlab-ci/container/debian/x86_test-base.sh | 2 +- .gitlab-ci/container/debian/x86_test-gl.sh | 2 +- .gitlab-ci/container/debian/x86_test-vk.sh | 2 +- .gitlab-ci/x86_64-w64-mingw32 | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci/container/create-android-cross-file.sh b/.gitlab-ci/container/create-android-cross-file.sh index 217ed3a..3064a48 100644 --- a/.gitlab-ci/container/create-android-cross-file.sh +++ b/.gitlab-ci/container/create-android-cross-file.sh @@ -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' diff --git a/.gitlab-ci/container/create-cross-file.sh b/.gitlab-ci/container/create-cross-file.sh index 1db9aa7..1883e9a 100755 --- a/.gitlab-ci/container/create-cross-file.sh +++ b/.gitlab-ci/container/create-cross-file.sh @@ -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 diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index 7180d4f..1596dfa 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -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 \ diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh index 4c2a601..8b33f48 100644 --- a/.gitlab-ci/container/debian/arm_build.sh +++ b/.gitlab-ci/container/debian/arm_build.sh @@ -54,7 +54,7 @@ apt-get -y install \ libwayland-dev \ llvm-11-dev \ ninja-build \ - pkg-config \ + pkgconf \ python3-mako \ python3-pil \ python3-pip \ diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh index 8fb49b5..88bcf54 100644 --- a/.gitlab-ci/container/debian/x86_build-base.sh +++ b/.gitlab-ci/container/debian/x86_build-base.sh @@ -62,7 +62,7 @@ apt-get install -y --no-remove \ libxxf86vm-dev \ make \ ninja-build \ - pkg-config \ + pkgconf \ python3-mako \ python3-pil \ python3-ply \ diff --git a/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake b/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake index 70da12d..e13aa4f 100644 --- a/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake +++ b/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake @@ -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) diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index 842500f..fb692c2 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -41,7 +41,7 @@ STABLE_EPHEMERAL=" \ make \ meson \ patch \ - pkg-config \ + pkgconf \ protobuf-compiler \ python3-dev \ python3-pip \ diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh index 4094dba..91c9b36 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -37,7 +37,7 @@ STABLE_EPHEMERAL=" \ meson \ ocl-icd-opencl-dev \ patch \ - pkg-config \ + pkgconf \ python3-distutils \ xz-utils \ " diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index b700b5c..f591a65 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -38,7 +38,7 @@ STABLE_EPHEMERAL=" \ mingw-w64-x86-64-dev \ p7zip \ patch \ - pkg-config \ + pkgconf \ python3-dev \ python3-distutils \ python3-pip \ diff --git a/.gitlab-ci/x86_64-w64-mingw32 b/.gitlab-ci/x86_64-w64-mingw32 index e17ddf4..5b32036 100644 --- a/.gitlab-ci/x86_64-w64-mingw32 +++ b/.gitlab-ci/x86_64-w64-mingw32 @@ -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'] -- 2.7.4