Skip to content

build: replace zlib with zlib-ng for rocksdb compression #3003

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

Merged
merged 2 commits into from
Jun 1, 2025
Merged

build: replace zlib with zlib-ng for rocksdb compression #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c09c08
build: replace zlib with zlib-ng for rocksdb compression
PragmaTwice Jun 1, 2025
a08b9c2
enable ZLIB_COMPAT
PragmaTwice Jun 1, 2025
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
2 changes: 1 addition & 1 deletion NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ zlib/libpng licenses
The following components are provided under the zlib/libpng License. See project link for details.
The text of each license is also included in licenses/LICENSE-[project].txt

* zlib(https://github.com/madler/zlib)
* zlib-ng(https://github.com/zlib-ng/zlib-ng)

================================================================
Public Domain
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindZLIB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if(zlib_SOURCE_DIR)

add_library(zlib_with_headers INTERFACE) # rocksdb use it
target_include_directories(zlib_with_headers INTERFACE $<BUILD_INTERFACE:${zlib_SOURCE_DIR}> $<BUILD_INTERFACE:${zlib_BINARY_DIR}>)
target_link_libraries(zlib_with_headers INTERFACE zlibstatic)
target_link_libraries(zlib_with_headers INTERFACE zlib)
add_library(ZLIB::ZLIB ALIAS zlib_with_headers)
install(TARGETS zlibstatic zlib_with_headers EXPORT RocksDBTargets) # export for install(...)
install(TARGETS zlib zlib_with_headers EXPORT RocksDBTargets) # export for install(...)
endif()
12 changes: 9 additions & 3 deletions cmake/zlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ include_guard()
include(cmake/utils.cmake)

FetchContent_DeclareGitHubWithMirror(zlib
madler/zlib v1.3
MD5=2be1b77674e5aa3196330e58180e5a2c
zlib-ng/zlib-ng 2.2.4
MD5=9fbaac3919af8d5a0ad5726ef9c7c30b
)

FetchContent_MakeAvailableWithArgs(zlib)
FetchContent_MakeAvailableWithArgs(zlib
WITH_GTEST=OFF
ZLIB_ENABLE_TESTS=OFF
ZLIBNG_ENABLE_TESTS=OFF
BUILD_SHARED_LIBS=OFF
ZLIB_COMPAT=ON
)
14 changes: 8 additions & 6 deletions licenses/LICENSE-zlib.txt → licenses/LICENSE-zlib-ng.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
(C) 1995-2022 Jean-loup Gailly and Mark Adler
(C) 1995-2024 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.

2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
misrepresented as being the original software.

3. This notice may not be removed or altered from any source distribution.
Loading