diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 3f04007a22..6337858562 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -50,14 +50,13 @@ RUN git init patches \ && rm -rf .git FROM builder AS zlib -RUN git init zlib \ +RUN git clone -b v1.3.1 --depth=1 {{ GIT }}/madler/zlib.git \ && cd zlib \ - && git remote add origin {{ GIT }}/madler/zlib.git \ - && git fetch --depth=1 origin 643e17b7498d12ab8d15565662880579692f769d \ - && git reset --hard FETCH_HEAD \ - && ./configure \ - && make -j$(nproc) \ - && make DESTDIR="{{ LibrariesPath }}/zlib-cache" install \ + && cmake -GNinja -B build . \ + -DCMAKE_BUILD_TYPE=None \ + -DZLIB_BUILD_EXAMPLES=OFF \ + && cmake --build build --parallel \ + && DESTDIR="{{ LibrariesPath }}/zlib-cache" cmake --install build \ && cd .. \ && rm -rf zlib diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 290b3ae8ae..8098a4f9f4 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -552,16 +552,16 @@ stage('xz', """ """) stage('zlib', """ - git clone https://github.com/madler/zlib.git + git clone -b v1.3.1 https://github.com/madler/zlib.git cd zlib - git checkout 643e17b749 win: cmake . ^ -A %WIN32X64% ^ -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$:Debug>" ^ -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^ -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 release: cmake --build . --config Release --parallel