Tidying

source/Dockerfile.multiarch

@@ -8,18 +8,18 @@ RUN apk add --no-cache \
     git \
     linux-headers \
     musl-dev \
-    zlib-dev \
-    bzip2-dev \
-    xz-dev \
-    zstd-dev \
+    zlib-static \
+    bzip2-static \
+    xz-static \
+    zstd-static \
     curl \
     bash \
     gcc \
     g++ \
     libstdc++ \
-    libstdc++-dev \
     ccache \
-    ninja
+    ninja \
+    pkgconfig
 
 FROM deps AS build
 
@@ -34,6 +34,10 @@ echo "Setting up build directory..."\n\
 mkdir -p /build/ccache\n\
 mkdir -p /build/build_${TARGETARCH}\n\
 \n\
+echo "Checking zlib installation..."\n\
+ls -la /usr/lib/libz* || true\n\
+pkg-config --libs zlib || true\n\
+\n\
 echo "Setting up ccache..."\n\
 export CCACHE_DIR=/build/ccache\n\
 export CCACHE_MAXSIZE=2G\n\
@@ -45,7 +49,13 @@ cmake /source -G Ninja -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
     -DBUILD_SHARED_LIBS=OFF \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache 2>&1 | tee cmake.log\n\
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
+    -DZLIB_INCLUDE_DIR=/usr/include \
+    -DZLIB_USE_STATIC_LIBS=TRUE \
+    -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++" \
+    -DCMAKE_C_FLAGS="-static" \
+    -DCMAKE_CXX_FLAGS="-static" 2>&1 | tee cmake.log\n\
 \n\
 echo "Starting build..."\n\
 ninja -v -j$(nproc) 2>&1 | tee build.log\n\