From dd596304e2996a3525e7f3f0a28111a16ec3f95f Mon Sep 17 00:00:00 2001 From: clux Date: Mon, 23 May 2022 23:31:57 +0100 Subject: [PATCH] extra evars + manually build port Signed-off-by: clux --- Dockerfile.stable | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile.stable b/Dockerfile.stable index 635ecfa..35738ad 100644 --- a/Dockerfile.stable +++ b/Dockerfile.stable @@ -106,6 +106,7 @@ RUN curl -sSL https://ftp.postgresql.org/pub/source/v$PQ_VER/postgresql-$PQ_VER. --with-openssl \ --prefix=$PREFIX --host=x86_64-unknown-linux-musl && \ cd src/common && make -s -j$(nproc) all && make -s install && cd ../.. && \ + cd src/port && make -s -j$(nproc) all && make -s install && cd ../.. && \ cd src/interfaces/libpq make -s -j$(nproc) all-static-lib && make -s install install-lib-static && \ cd ../../bin/pg_config && make -j $(nproc) && make install && \ cd .. && rm -rf postgresql-$PQ_VER @@ -128,11 +129,15 @@ RUN curl -sSL https://www.sqlite.org/2022/sqlite-autoconf-$SQLITE_VER.tar.gz | t # It needs the non-musl pg_config to set this up with libpq-dev (depending on libssl-dev) # See https://github.com/sgrif/pq-sys/pull/18 ENV PATH=$PREFIX/bin:$PATH \ + TARGET=x86_64_unknown_linux_musl \ + HOST=x86_64_unknown_linux_gnu \ PKG_CONFIG_ALLOW_CROSS=true \ PKG_CONFIG_ALL_STATIC=true \ PQ_LIB_STATIC_X86_64_UNKNOWN_LINUX_MUSL=true \ PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig \ + PKG_CONFIG_PATH_X86_64_UNKNOWN_LINUX_MUSL=$PREFIX/lib/pkgconfig \ PG_CONFIG_X86_64_UNKNOWN_LINUX_GNU=/usr/bin/pg_config \ + PG_CONFIG_X86_64_UNKNOWN_LINUX_MUSL=/musl/bin/pg_config \ OPENSSL_STATIC=true \ OPENSSL_DIR=$PREFIX \ SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \