ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2024-12-22 06:27:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update pq, zlib and openssl versions.

Browse Source 
The old zlib download URL returns 404 and breaks the build.
OpenSSL 1.1.1 is almost EOL.
This commit is contained in:
Orne Brocaar 2023-09-05 09:36:23 +01:00
parent 295cd5e4b1
commit adec1fdca4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cross/Dockerfile.aarch64-unknown-linux-musl
View File

@ -1,8 +1,8 @@
FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:latest FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:latest
ENV ZLIB_VERSION=1.2.13 ENV ZLIB_VERSION=1.3
ENV POSTGRESQL_VERSION=11.20 ENV POSTGRESQL_VERSION=11.21
ENV OPENSSL_VERSION=1.1.1t ENV OPENSSL_VERSION=3.1.2
ENV OPENSSL_TARGET=linux-aarch64 ENV OPENSSL_TARGET=linux-aarch64
ENV MUSL_PREFIX=aarch64-linux-musl ENV MUSL_PREFIX=aarch64-linux-musl
ENV POSTGRESQL_HOST=aarch64-unknown-linux-musl ENV POSTGRESQL_HOST=aarch64-unknown-linux-musl

6
cross/Dockerfile.armv7-unknown-linux-musleabihf
View File

@ -1,8 +1,8 @@
FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:latest FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:latest
ENV ZLIB_VERSION=1.2.13 ENV ZLIB_VERSION=1.3
ENV POSTGRESQL_VERSION=11.20 ENV POSTGRESQL_VERSION=11.21
ENV OPENSSL_VERSION=1.1.1t ENV OPENSSL_VERSION=3.1.2
ENV OPENSSL_TARGET=linux-generic32 ENV OPENSSL_TARGET=linux-generic32
ENV MUSL_PREFIX=arm-linux-musleabihf ENV MUSL_PREFIX=arm-linux-musleabihf
ENV POSTGRESQL_HOST=armv7-unknown-linux-musleabihf ENV POSTGRESQL_HOST=armv7-unknown-linux-musleabihf

10
cross/Dockerfile.x86_64-unknown-linux-musl
View File

@ -1,8 +1,8 @@
FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:latest FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:latest
ENV ZLIB_VERSION=1.2.13 ENV ZLIB_VERSION=1.3
ENV POSTGRESQL_VERSION=11.20 ENV POSTGRESQL_VERSION=11.21
ENV OPENSSL_VERSION=1.1.1t ENV OPENSSL_VERSION=3.1.2
ENV OPENSSL_TARGET=linux-x86_64 ENV OPENSSL_TARGET=linux-x86_64
ENV MUSL_PREFIX=x86_64-linux-musl ENV MUSL_PREFIX=x86_64-linux-musl
@ -33,7 +33,7 @@ RUN echo "Building libpq" && \
cd /tmp && \ cd /tmp && \
curl -fLO "https://ftp.postgresql.org/pub/source/v$POSTGRESQL_VERSION/postgresql-$POSTGRESQL_VERSION.tar.gz" && \ 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" && \ 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 && \ cd src/interfaces/libpq && make all-static-lib && make install-lib-static && \
rm -r /tmp/* 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 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 ENV PKG_CONFIG_PATH=/usr/local/$MUSL_PREFIX-target/lib/pkgconfig:/usr/local/$MUSL_PREFIX-target/lib64/pkgconfig