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.

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

Issue 50/remove snappy from contrib #109

Merged
merged 8 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/actions/prepare_vm/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
sudo apt-get -y update
sudo apt-get -y install git cmake ninja-build libidn11-dev ragel yasm protobuf-compiler \
protobuf-compiler-grpc libprotobuf-dev libgrpc++-dev libgrpc-dev libgrpc++1 libgrpc10 \
rapidjson-dev zlib1g-dev libxxhash-dev libzstd-dev
rapidjson-dev zlib1g-dev libxxhash-dev libzstd-dev libsnappy-dev
wget https://apt.llvm.org/llvm.sh
chmod u+x llvm.sh
sudo ./llvm.sh 16
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ If you ok with this warning, then...
- xxhash
- zlib
- zstd
- snappy 1.1.8+

## Runtime requirements

Expand All @@ -38,7 +39,7 @@ If you ok with this warning, then...
sudo apt-get -y update
sudo apt-get -y install git cmake ninja-build libidn11-dev ragel yasm protobuf-compiler \
protobuf-compiler-grpc libprotobuf-dev libgrpc++-dev libgrpc-dev libgrpc++1 libgrpc10 \
rapidjson-dev zlib1g-dev libxxhash-dev libzstd-dev
rapidjson-dev zlib1g-dev libxxhash-dev libzstd-dev libsnappy-dev

wget https://apt.llvm.org/llvm.sh
chmod u+x llvm.sh
Expand Down
1 change: 1 addition & 0 deletions cmake/external_libs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ find_package(RapidJSON REQUIRED)
find_package(ZLIB REQUIRED)
find_package(xxHash REQUIRED)
find_package(ZSTD REQUIRED)
find_package(Snappy 1.1.8 REQUIRED CONFIG)

# rapidjson
add_library(ydb-sdk-rapidjson INTERFACE)
Expand Down
1 change: 0 additions & 1 deletion contrib/libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ add_subdirectory(libc_compat)
add_subdirectory(lz4)
add_subdirectory(lzmasdk)
add_subdirectory(nayuki_md5)
add_subdirectory(snappy)
#add_subdirectory(zstd)
add_subdirectory(zstd06)
1 change: 0 additions & 1 deletion contrib/libs/snappy/AUTHORS

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.darwin-arm64.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.darwin-x86_64.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.linux-aarch64.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.linux-x86_64.txt

This file was deleted.

19 changes: 0 additions & 19 deletions contrib/libs/snappy/CMakeLists.txt

This file was deleted.

26 changes: 0 additions & 26 deletions contrib/libs/snappy/CMakeLists.windows-x86_64.txt

This file was deleted.

31 changes: 0 additions & 31 deletions contrib/libs/snappy/CONTRIBUTING.md

This file was deleted.

54 changes: 0 additions & 54 deletions contrib/libs/snappy/COPYING

This file was deleted.

Loading
Loading