Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[zlib] Bump to upstream 1.2.12 #68219

Closed
wants to merge 7 commits into from
Closed

[zlib] Bump to upstream 1.2.12 #68219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d20e034
[zlib] Bump to 1.2.12
lambdageek Apr 19, 2022
3642cc0
[zlib] Cherrypick upstream crc32 fix
lambdageek Apr 19, 2022
7c1da52
edit zlib-version.txt
lambdageek Apr 19, 2022
f5f0fa3
[zlib] Turn off warnings as errors for -Wstrict-prototypes
lambdageek Apr 22, 2022
d56bfae
Bump zlib-intel to v1.2.12_jtk
lambdageek Apr 22, 2022
c3d4e74
Cherrypick vanilla zlib crc32 fix to zlib-intel
lambdageek Apr 22, 2022
3c3d19b
another try at zlib warnings
lambdageek Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/mono/mono/mini/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@ endif()
if(HOST_WIN32)
set_source_files_properties(${ZLIB_SOURCES} PROPERTIES COMPILE_OPTIONS "/wd4005;/wd4127;/wd4131;/wd4244")
endif()
if (ZLIB_SOURCES)
set_zlib_source_files_properties()
endif()

set(monosgen-sources "${metadata_sources};${utils_sources};${sgen_sources};${icu_shim_sources};${mini_sources};${ZLIB_SOURCES}")

Expand Down
13 changes: 9 additions & 4 deletions src/native/external/zlib-intel-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
bf103c626c6c0d80580748f6b814ec534614ca52
33f8f35b83b05539ea65489b5977683bcacbeb97

https://github.com/jtkukunas/zlib/commit/bf103c626c6c0d80580748f6b814ec534614ca52
https://github.com/jtkukunas/zlib/tree/v1.2.12_jtk
https://github.com/jtkukunas/zlib/commit/33f8f35b83b05539ea65489b5977683bcacbeb97

Note: This library is not using a proper release lifecycle. v1.2.11.1_jtkv6.3 was the last version released in 2019.
Therefore, we are pointing to a random commit from 2021 rather than a version tag.
Note: This library sometimes does not use a proper release lifecycle.
Therefore, we may point to a random commit rather than a version tag.


Cherrypick vanilla zlib commit https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2 onto zlib-intel
(https://github.com/jtkukunas/zlib/issues/37)
7 changes: 7 additions & 0 deletions src/native/external/zlib-intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@ set(ZLIB_SOURCES_BASE
)

addprefix(ZLIB_SOURCES "${CMAKE_CURRENT_LIST_DIR}/zlib-intel" "${ZLIB_SOURCES_BASE}")

function(set_zlib_source_files_properties)
if (CMAKE_C_COMPILER_ID MATCHES "Clang")
# Turn off warn-as-error for strict prototype checking until https://github.com/madler/zlib/issues/633 is fixed upstream
set_source_files_properties(${ZLIB_SOURCES} PROPERTIES COMPILE_OPTIONS "-Wno-error=strict-prototypes;-Wno-error=missing-prototypes")
endif()
endfunction()
Loading