Update zlib to 1.3.1

This commit is contained in:
Ilya Fedin 2025-05-01 14:16:34 +04:00 committed by John Preston
parent e81a2a5011
commit cfefb8b2e0
2 changed files with 9 additions and 10 deletions

View file

@ -50,14 +50,13 @@ RUN git init patches \
&& rm -rf .git && rm -rf .git
FROM builder AS zlib FROM builder AS zlib
RUN git init zlib \ RUN git clone -b v1.3.1 --depth=1 {{ GIT }}/madler/zlib.git \
&& cd zlib \ && cd zlib \
&& git remote add origin {{ GIT }}/madler/zlib.git \ && cmake -GNinja -B build . \
&& git fetch --depth=1 origin 643e17b7498d12ab8d15565662880579692f769d \ -DCMAKE_BUILD_TYPE=None \
&& git reset --hard FETCH_HEAD \ -DZLIB_BUILD_EXAMPLES=OFF \
&& ./configure \ && cmake --build build --parallel \
&& make -j$(nproc) \ && DESTDIR="{{ LibrariesPath }}/zlib-cache" cmake --install build \
&& make DESTDIR="{{ LibrariesPath }}/zlib-cache" install \
&& cd .. \ && cd .. \
&& rm -rf zlib && rm -rf zlib

View file

@ -552,16 +552,16 @@ stage('xz', """
""") """)
stage('zlib', """ stage('zlib', """
git clone https://github.com/madler/zlib.git git clone -b v1.3.1 https://github.com/madler/zlib.git
cd zlib cd zlib
git checkout 643e17b749
win: win:
cmake . ^ cmake . ^
-A %WIN32X64% ^ -A %WIN32X64% ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^ -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^ -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^ -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DCMAKE_C_FLAGS="/DZLIB_WINAPI" -DCMAKE_C_FLAGS="/DZLIB_WINAPI" ^
-DZLIB_BUILD_EXAMPLES=OFF
cmake --build . --config Debug --parallel cmake --build . --config Debug --parallel
release: release:
cmake --build . --config Release --parallel cmake --build . --config Release --parallel