-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update dependency zlib to v1.3.1 (#233)
* Update dependency zlib to v1.3.1 * fix zlib * fix sha * fix * Update zlib.patch * Update zlib.patch --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: anakinxc <103552181+anakinxc@users.noreply.github.com>
- Loading branch information
1 parent
87b814a
commit da86e89
Showing
2 changed files
with
22 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,39 @@ | ||
| diff --git a/gzlib.c b/gzlib.c | ||
| index 29fc448..9bbf509 100644 | ||
| --- a/gzlib.c | ||
| +++ b/gzlib.c | ||
| @@ -579,4 +579,9 @@ unsigned ZLIB_INTERNAL gz_intmax(void) { | ||
| } while (p > q); | ||
| return q >> 1; | ||
| } | ||
| +#else | ||
| +unsigned ZLIB_INTERNAL gz_intmax() | ||
| +{ | ||
| + return INT_MAX; | ||
| +} | ||
| #endif | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 7f1b69f..7bd357b 100644 | ||
| index 15ceebe..1d19c83 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -15,7 +15,6 @@ include(CheckTypeSize) | ||
| @@ -17,7 +17,6 @@ include(CheckTypeSize) | ||
| include(CheckFunctionExists) | ||
| include(CheckIncludeFile) | ||
| include(CheckCSourceCompiles) | ||
| -enable_testing() | ||
|
|
||
| check_include_file(sys/types.h HAVE_SYS_TYPES_H) | ||
| check_include_file(stdint.h HAVE_STDINT_H) | ||
| @@ -147,35 +146,15 @@ if(MINGW) | ||
| set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) | ||
| endif(MINGW) | ||
|
|
||
| -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| -set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) | ||
| -set_target_properties(zlib PROPERTIES SOVERSION 1) | ||
| - | ||
| -if(NOT CYGWIN) | ||
| - # This property causes shared libraries on Linux to have the full version | ||
| - # encoded into their final filename. We disable this on Cygwin because | ||
| - # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll | ||
| - # seems to be the default. | ||
| - # | ||
| - # This has no effect with MSVC, on that platform the version info for | ||
| - # the DLL comes from the resource file win32/zlib1.rc | ||
| - set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) | ||
| -endif() | ||
|
|
||
| if(UNIX) | ||
| # On unix-like platforms the library is almost always called libz | ||
| - set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) | ||
| - if(NOT APPLE) | ||
| - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") | ||
| - endif() | ||
| -elseif(BUILD_SHARED_LIBS AND WIN32) | ||
| - # Creates zlib1.dll when building shared library version | ||
| - set_target_properties(zlib PROPERTIES SUFFIX "1.dll") | ||
| + set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z) | ||
| endif() | ||
|
|
||
| if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) | ||
| - install(TARGETS zlib zlibstatic | ||
| + install(TARGETS zlibstatic | ||
| RUNTIME DESTINATION "${INSTALL_BIN_DIR}" | ||
| ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" | ||
| LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) | ||
| @@ -189,25 +168,3 @@ endif() | ||
| @@ -193,26 +192,3 @@ endif() | ||
| if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) | ||
| install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") | ||
| endif() | ||
| - | ||
| -#============================================================================ | ||
| -# Example binaries | ||
| -#============================================================================ | ||
| -if(ZLIB_BUILD_EXAMPLES) | ||
| - add_executable(example test/example.c) | ||
| - target_link_libraries(example zlib) | ||
| - add_test(example example) | ||
| - | ||
| -add_executable(example test/example.c) | ||
| -target_link_libraries(example zlib) | ||
| -add_test(example example) | ||
| - | ||
| -add_executable(minigzip test/minigzip.c) | ||
| -target_link_libraries(minigzip zlib) | ||
| - add_executable(minigzip test/minigzip.c) | ||
| - target_link_libraries(minigzip zlib) | ||
| - | ||
| -if(HAVE_OFF64_T) | ||
| - add_executable(example64 test/example.c) | ||
| - target_link_libraries(example64 zlib) | ||
| - set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") | ||
| - add_test(example64 example64) | ||
| - if(HAVE_OFF64_T) | ||
| - add_executable(example64 test/example.c) | ||
| - target_link_libraries(example64 zlib) | ||
| - set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") | ||
| - add_test(example64 example64) | ||
| - | ||
| - add_executable(minigzip64 test/minigzip.c) | ||
| - target_link_libraries(minigzip64 zlib) | ||
| - set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") | ||
| - add_executable(minigzip64 test/minigzip.c) | ||
| - target_link_libraries(minigzip64 zlib) | ||
| - set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") | ||
| - endif() | ||
| -endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters