diff --git a/source/Dockerfile.multiarch b/source/Dockerfile.multiarch index 685c3de..be1a64a 100644 --- a/source/Dockerfile.multiarch +++ b/source/Dockerfile.multiarch @@ -8,6 +8,8 @@ RUN apk add --no-cache \ git \ linux-headers \ musl-dev \ + zlib \ + zlib-dev \ zlib-static \ bzip2-static \ xz-static \ @@ -34,9 +36,8 @@ 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\ +echo "Checking static libraries..."\n\ +ls -la /usr/lib/libz.a /usr/lib/libstdc++.a /usr/lib/libc.a || true\n\ \n\ echo "Setting up ccache..."\n\ export CCACHE_DIR=/build/ccache\n\ @@ -53,9 +54,10 @@ cmake /source -G Ninja -DCMAKE_BUILD_TYPE=Release \ -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\ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,-Bstatic -lz -lstdc++ -static-libgcc" \ + -DCMAKE_C_FLAGS="-fPIC" \ + -DCMAKE_CXX_FLAGS="-fPIC" \ + -DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=".a" 2>&1 | tee cmake.log\n\ \n\ echo "Starting build..."\n\ ninja -v -j$(nproc) 2>&1 | tee build.log\n\