diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-02-07 23:45:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-07 23:45:02 +0100 |
| commit | ca1ec7b147087f18bec0b3cf0b0548f3f034c675 (patch) | |
| tree | 630b9bee287c52fd4a119bbf401c61c2d37cbb86 /.github/workflows/linux_gcc_32bit | |
| parent | 7f0ac75ac58794bb92b88f928d16c5053c0ce3e0 (diff) | |
| parent | 2b0ecb6f19b1be906a39eac5143d4c40252f0a5a (diff) | |
| download | PROJ-ca1ec7b147087f18bec0b3cf0b0548f3f034c675.tar.gz PROJ-ca1ec7b147087f18bec0b3cf0b0548f3f034c675.zip | |
Merge pull request #2988 from dg0yt/pkgconfig
Use `Requires.Private` in proj.pc, and install it also for Windows
Diffstat (limited to '.github/workflows/linux_gcc_32bit')
| -rwxr-xr-x | .github/workflows/linux_gcc_32bit/start.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/linux_gcc_32bit/start.sh b/.github/workflows/linux_gcc_32bit/start.sh index c54eb5ed..60be6fd3 100755 --- a/.github/workflows/linux_gcc_32bit/start.sh +++ b/.github/workflows/linux_gcc_32bit/start.sh @@ -9,14 +9,15 @@ 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 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 |