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 --- travis/linux_generic/before_install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'travis/linux_generic') diff --git a/travis/linux_generic/before_install.sh b/travis/linux_generic/before_install.sh index 114d8a7f..dbd5f5b2 100755 --- a/travis/linux_generic/before_install.sh +++ b/travis/linux_generic/before_install.sh @@ -5,4 +5,8 @@ set -e ./travis/before_install_apt.sh ./travis/before_install_pip.sh -sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev zip +sudo apt-get install -qq \ + sqlite3 zip \ + libsqlite3-dev \ + libtiff-dev \ + libcurl4-openssl-dev -- 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. --- travis/linux_generic/before_install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'travis/linux_generic') diff --git a/travis/linux_generic/before_install.sh b/travis/linux_generic/before_install.sh index dbd5f5b2..07d5c979 100755 --- a/travis/linux_generic/before_install.sh +++ b/travis/linux_generic/before_install.sh @@ -9,4 +9,5 @@ sudo apt-get install -qq \ sqlite3 zip \ libsqlite3-dev \ libtiff-dev \ - libcurl4-openssl-dev + libcurl4-openssl-dev libnghttp2-dev libidn2-dev librtmp-dev libssh-dev \ + libpsl-dev libssl-dev libkrb5-dev comerr-dev libldap2-dev libbrotli-dev -- cgit v1.2.3