From adec1fdca4db03bbdcdc60e7de024cdbe25ab9df Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Tue, 5 Sep 2023 09:36:23 +0100 Subject: [PATCH] Update pq, zlib and openssl versions. The old zlib download URL returns 404 and breaks the build. OpenSSL 1.1.1 is almost EOL. --- cross/Dockerfile.aarch64-unknown-linux-musl | 6 +++--- cross/Dockerfile.armv7-unknown-linux-musleabihf | 6 +++--- cross/Dockerfile.x86_64-unknown-linux-musl | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cross/Dockerfile.aarch64-unknown-linux-musl b/cross/Dockerfile.aarch64-unknown-linux-musl index 7f45a0d8..b79df771 100644 --- a/cross/Dockerfile.aarch64-unknown-linux-musl +++ b/cross/Dockerfile.aarch64-unknown-linux-musl @@ -1,8 +1,8 @@ FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:latest -ENV ZLIB_VERSION=1.2.13 -ENV POSTGRESQL_VERSION=11.20 -ENV OPENSSL_VERSION=1.1.1t +ENV ZLIB_VERSION=1.3 +ENV POSTGRESQL_VERSION=11.21 +ENV OPENSSL_VERSION=3.1.2 ENV OPENSSL_TARGET=linux-aarch64 ENV MUSL_PREFIX=aarch64-linux-musl ENV POSTGRESQL_HOST=aarch64-unknown-linux-musl diff --git a/cross/Dockerfile.armv7-unknown-linux-musleabihf b/cross/Dockerfile.armv7-unknown-linux-musleabihf index 78081001..491ecd85 100644 --- a/cross/Dockerfile.armv7-unknown-linux-musleabihf +++ b/cross/Dockerfile.armv7-unknown-linux-musleabihf @@ -1,8 +1,8 @@ FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:latest -ENV ZLIB_VERSION=1.2.13 -ENV POSTGRESQL_VERSION=11.20 -ENV OPENSSL_VERSION=1.1.1t +ENV ZLIB_VERSION=1.3 +ENV POSTGRESQL_VERSION=11.21 +ENV OPENSSL_VERSION=3.1.2 ENV OPENSSL_TARGET=linux-generic32 ENV MUSL_PREFIX=arm-linux-musleabihf ENV POSTGRESQL_HOST=armv7-unknown-linux-musleabihf diff --git a/cross/Dockerfile.x86_64-unknown-linux-musl b/cross/Dockerfile.x86_64-unknown-linux-musl index 584ec03c..e747d228 100644 --- a/cross/Dockerfile.x86_64-unknown-linux-musl +++ b/cross/Dockerfile.x86_64-unknown-linux-musl @@ -1,8 +1,8 @@ FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:latest -ENV ZLIB_VERSION=1.2.13 -ENV POSTGRESQL_VERSION=11.20 -ENV OPENSSL_VERSION=1.1.1t +ENV ZLIB_VERSION=1.3 +ENV POSTGRESQL_VERSION=11.21 +ENV OPENSSL_VERSION=3.1.2 ENV OPENSSL_TARGET=linux-x86_64 ENV MUSL_PREFIX=x86_64-linux-musl @@ -33,7 +33,7 @@ RUN echo "Building libpq" && \ cd /tmp && \ curl -fLO "https://ftp.postgresql.org/pub/source/v$POSTGRESQL_VERSION/postgresql-$POSTGRESQL_VERSION.tar.gz" && \ tar xzf "postgresql-$POSTGRESQL_VERSION.tar.gz" && cd "postgresql-$POSTGRESQL_VERSION" && \ - CC=$MUSL_PREFIX-gcc CPPFLAGS="-I/usr/local/$MUSL_PREFIX/include -I/usr/local/$MUSL_PREFIX-target/include" LDFLAGS="-L/usr/local/$MUSL_PREFIX/lib -L/usr/local/$MUSL_PREFIX-target/lib" ./configure --with-openssl --without-readline --prefix=/usr/local/$MUSL_PREFIX-target && \ + CC=$MUSL_PREFIX-gcc CPPFLAGS="-I/usr/local/$MUSL_PREFIX/include -I/usr/local/$MUSL_PREFIX-target/include" LDFLAGS="-L/usr/local/$MUSL_PREFIX/lib -L/usr/local/$MUSL_PREFIX-target/lib -L/usr/local/$MUSL_PREFIX-target/lib64" ./configure --with-openssl --without-readline --prefix=/usr/local/$MUSL_PREFIX-target && \ cd src/interfaces/libpq && make all-static-lib && make install-lib-static && \ rm -r /tmp/* @@ -41,4 +41,4 @@ RUN echo "Building libpq" && \ RUN objcopy --redefine-sym unicode_to_utf8=unicode_to_utf8_rename /usr/local/$MUSL_PREFIX-target/lib/libpq.a -ENV PKG_CONFIG_PATH=/usr/local/$MUSL_PREFIX-target/lib/pkgconfig \ No newline at end of file +ENV PKG_CONFIG_PATH=/usr/local/$MUSL_PREFIX-target/lib/pkgconfig:/usr/local/$MUSL_PREFIX-target/lib64/pkgconfig \ No newline at end of file