From 295c67869270dc9319f965f1c18108fad516296e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 5 Feb 2022 12:01:28 +0100 Subject: Harmonize CI apt setup --- .github/workflows/clang_linux/start.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.github/workflows/clang_linux') diff --git a/.github/workflows/clang_linux/start.sh b/.github/workflows/clang_linux/start.sh index b0a5ac34..81eca492 100755 --- a/.github/workflows/clang_linux/start.sh +++ b/.github/workflows/clang_linux/start.sh @@ -4,8 +4,12 @@ set -e apt-get update -y DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - sudo autoconf automake libtool clang++-10 python3-clang-10 make cmake ccache pkg-config tar zip \ - sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev jq python3-pip nlohmann-json3-dev libgtest-dev + autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ + clang++-10 jq python3-clang-10 \ + libsqlite3-dev \ + libtiff-dev \ + libcurl4-openssl-dev \ + nlohmann-json3-dev libgtest-dev python3 -m pip install --user jsonschema export PATH=$HOME/.local/bin:$PATH -- cgit v1.2.3 From 2b0ecb6f19b1be906a39eac5143d4c40252f0a5a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 5 Feb 2022 12:03:25 +0100 Subject: Adapt testing to recursive pkg-config requirements When pkg-config is called with --static, it will recursively collect all Libs and Libs.private which are discovered via Requires and Requires.private. So these libs must be available for linking even when acutally only lib proj uses static linkage. Libs and pkg-config must be provided for the target triplet. --- .github/workflows/clang_linux/start.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.github/workflows/clang_linux') diff --git a/.github/workflows/clang_linux/start.sh b/.github/workflows/clang_linux/start.sh index 81eca492..48099fe3 100755 --- a/.github/workflows/clang_linux/start.sh +++ b/.github/workflows/clang_linux/start.sh @@ -7,8 +7,9 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ clang++-10 jq python3-clang-10 \ libsqlite3-dev \ - libtiff-dev \ - libcurl4-openssl-dev \ + libtiff-dev libwebp-dev libzstd-dev \ + libcurl4-openssl-dev libnghttp2-dev libidn2-dev librtmp-dev libssh-dev \ + libpsl-dev libssl-dev libkrb5-dev comerr-dev libldap2-dev libbrotli-dev \ nlohmann-json3-dev libgtest-dev python3 -m pip install --user jsonschema -- cgit v1.2.3