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 ++++++-- .github/workflows/linux_gcc_32bit/start.sh | 12 ++++++------ .github/workflows/linux_gcc_5_4/start.sh | 12 ++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) (limited to '.github') 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 diff --git a/.github/workflows/linux_gcc_32bit/start.sh b/.github/workflows/linux_gcc_32bit/start.sh index c54eb5ed..87a98a0b 100755 --- a/.github/workflows/linux_gcc_32bit/start.sh +++ b/.github/workflows/linux_gcc_32bit/start.sh @@ -9,14 +9,14 @@ export TRAVIS_BUILD_DIR="$WORK_DIR" ARCH=i386 dpkg --add-architecture i386 -apt update -y +apt-get update -y DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -o APT::Immediate-Configure=0 \ - autoconf automake libtool gcc-multilib g++-multilib g++ sqlite3 \ - python3-pip \ - make cmake ccache pkg-config tar zip \ - libsqlite3-dev:$ARCH libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH \ - jq + autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ + gcc-multilib g++-multilib g++ jq dpkg-dev \ + libsqlite3-dev:$ARCH \ + libtiff-dev:$ARCH \ + libcurl4-openssl-dev:$ARCH python3 -m pip install --user jsonschema export PATH=$HOME/.local/bin:$PATH diff --git a/.github/workflows/linux_gcc_5_4/start.sh b/.github/workflows/linux_gcc_5_4/start.sh index fc7abb1e..4b7088d7 100755 --- a/.github/workflows/linux_gcc_5_4/start.sh +++ b/.github/workflows/linux_gcc_5_4/start.sh @@ -6,14 +6,14 @@ export TRAVIS_OS_NAME=linux export BUILD_NAME=linux_gcc export TRAVIS_BUILD_DIR="$WORK_DIR" -apt update -y +apt-get update -y DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - autoconf automake libtool g++ sqlite3 \ - python3-pip python3-setuptools \ - make cmake ccache pkg-config tar zip \ - libsqlite3-dev libtiff-dev libcurl4-openssl-dev \ - jq lcov + autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ + g++ jq lcov python3-setuptools \ + libsqlite3-dev \ + libtiff-dev \ + libcurl4-openssl-dev python3 -m pip install --user --upgrade "pip < 21.0" echo `python3 -m pip --version` -- 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 +++-- .github/workflows/linux_gcc_32bit/start.sh | 7 +++++-- .github/workflows/linux_gcc_5_4/start.sh | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to '.github') 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 diff --git a/.github/workflows/linux_gcc_32bit/start.sh b/.github/workflows/linux_gcc_32bit/start.sh index 87a98a0b..60be6fd3 100755 --- a/.github/workflows/linux_gcc_32bit/start.sh +++ b/.github/workflows/linux_gcc_32bit/start.sh @@ -15,8 +15,9 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -o AP autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ gcc-multilib g++-multilib g++ jq dpkg-dev \ libsqlite3-dev:$ARCH \ - libtiff-dev:$ARCH \ - libcurl4-openssl-dev:$ARCH + libtiff-dev:$ARCH libwebp-dev:$ARCH libzstd-dev:$ARCH \ + libcurl4-openssl-dev:$ARCH libnghttp2-dev:$ARCH libidn2-dev:$ARCH librtmp-dev:$ARCH libssh-dev:$ARCH \ + libpsl-dev:$ARCH libssl-dev:$ARCH libkrb5-dev:$ARCH comerr-dev:$ARCH libldap2-dev:$ARCH libbrotli-dev:$ARCH python3 -m pip install --user jsonschema export PATH=$HOME/.local/bin:$PATH @@ -28,6 +29,8 @@ export TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff" export SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu export SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3" +export PKG_CONFIG=i686-linux-gnu-pkg-config + cd "$WORK_DIR" if test -f "$WORK_DIR/ccache.tar.gz"; then diff --git a/.github/workflows/linux_gcc_5_4/start.sh b/.github/workflows/linux_gcc_5_4/start.sh index 4b7088d7..be23392b 100755 --- a/.github/workflows/linux_gcc_5_4/start.sh +++ b/.github/workflows/linux_gcc_5_4/start.sh @@ -13,7 +13,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ g++ jq lcov python3-setuptools \ libsqlite3-dev \ libtiff-dev \ - libcurl4-openssl-dev + libcurl4-openssl-dev libidn11-dev librtmp-dev libssl-dev libkrb5-dev comerr-dev libldap2-dev python3 -m pip install --user --upgrade "pip < 21.0" echo `python3 -m pip --version` -- cgit v1.2.3