updated to vesrion 1.1.9
This commit is contained in:
Martin Gieseking
parent
6476fb5219
commit
15139620f3
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@
|
||||
/snappy-1.1.4.tar.gz
|
||||
/snappy-1.1.7.tar.gz
|
||||
/snappy-1.1.8.tar.gz
|
||||
/snappy-1.1.9.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -212,7 +212,7 @@
|
||||
"snappy-test.cc"
|
||||
)
|
||||
target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
|
||||
- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
|
||||
+ target_link_libraries(snappy_unittest snappy ${GTEST_LIBRARIES} ${GFLAGS_LIBRARIES})
|
||||
|
||||
if(HAVE_LIBZ)
|
||||
target_link_libraries(snappy_unittest z)
|
||||
12
snappy-inline.patch
Normal file
12
snappy-inline.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -r fd16c2ca3237 snappy.cc
|
||||
--- a/snappy.cc Sat May 15 15:06:59 2021 +0200
|
||||
+++ b/snappy.cc Sat May 15 15:07:31 2021 +0200
|
||||
@@ -1014,7 +1014,7 @@
|
||||
}
|
||||
|
||||
SNAPPY_ATTRIBUTE_ALWAYS_INLINE
|
||||
-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
|
||||
+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
|
||||
const uint8_t*& ip = *ip_p;
|
||||
// This section is crucial for the throughput of the decompression loop.
|
||||
// The latency of an iteration is fundamentally constrained by the
|
||||
48
snappy-thirdparty.patch
Normal file
48
snappy-thirdparty.patch
Normal file
@ -0,0 +1,48 @@
|
||||
diff -r efdeda5cdfa2 CMakeLists.txt
|
||||
--- a/CMakeLists.txt Sat May 15 14:50:17 2021 +0200
|
||||
+++ b/CMakeLists.txt Sat May 15 14:54:41 2021 +0200
|
||||
@@ -284,29 +284,12 @@
|
||||
if(SNAPPY_BUILD_TESTS)
|
||||
enable_testing()
|
||||
|
||||
- # Prevent overriding the parent project's compiler/linker settings on Windows.
|
||||
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||||
- set(install_gtest OFF)
|
||||
- set(install_gmock OFF)
|
||||
- set(build_gmock ON)
|
||||
-
|
||||
- # This project is tested using GoogleTest.
|
||||
- add_subdirectory("third_party/googletest")
|
||||
-
|
||||
- # GoogleTest triggers a missing field initializers warning.
|
||||
- if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
||||
- set_property(TARGET gtest
|
||||
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
||||
- set_property(TARGET gmock
|
||||
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
||||
- endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
||||
-
|
||||
add_executable(snappy_unittest "")
|
||||
target_sources(snappy_unittest
|
||||
PRIVATE
|
||||
"snappy_unittest.cc"
|
||||
)
|
||||
- target_link_libraries(snappy_unittest snappy_test_support gmock_main gtest)
|
||||
+ target_link_libraries(snappy_unittest snappy_test_support gtest_main gtest)
|
||||
|
||||
add_test(
|
||||
NAME snappy_unittest
|
||||
@@ -327,12 +310,11 @@
|
||||
PRIVATE
|
||||
"snappy_benchmark.cc"
|
||||
)
|
||||
- target_link_libraries(snappy_benchmark snappy_test_support benchmark_main)
|
||||
+ target_link_libraries(snappy_benchmark snappy_test_support benchmark_main benchmark)
|
||||
|
||||
# This project uses Google benchmark for benchmarking.
|
||||
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
|
||||
set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
|
||||
- add_subdirectory("third_party/benchmark")
|
||||
endif(SNAPPY_BUILD_BENCHMARKS)
|
||||
|
||||
if(SNAPPY_FUZZING_BUILD)
|
||||
24
snappy.spec
24
snappy.spec
@ -1,19 +1,23 @@
|
||||
%global __cmake_in_source_build 1
|
||||
Name: snappy
|
||||
Version: 1.1.8
|
||||
Release: 5%{?dist}
|
||||
Version: 1.1.9
|
||||
Release: 1%{?dist}
|
||||
Summary: Fast compression and decompression library
|
||||
|
||||
License: BSD
|
||||
URL: https://github.com/google/snappy
|
||||
Source0: https://github.com/google/snappy/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# add missing dependency on gtest to snappy_unittest
|
||||
Patch0: %{name}-gtest.patch
|
||||
# Remove dependency on bundled gtest and google-benchmark.
|
||||
Patch0: %{name}-thirdparty.patch
|
||||
|
||||
BuildRequires: make
|
||||
# Prevent compiler error due to missing 'inline'.
|
||||
Patch1: %{name}-inline.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: google-benchmark-devel
|
||||
BuildRequires: gtest-devel
|
||||
|
||||
%description
|
||||
@ -37,8 +41,8 @@ developing applications that use %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup
|
||||
|
||||
|
||||
%build
|
||||
%cmake .
|
||||
@ -75,7 +79,8 @@ ctest -V %{?_smp_mflags}
|
||||
|
||||
|
||||
%files
|
||||
%doc AUTHORS COPYING NEWS README.md
|
||||
%license COPYING
|
||||
%doc AUTHORS NEWS README.md
|
||||
%{_libdir}/libsnappy.so.*
|
||||
|
||||
%files devel
|
||||
@ -87,6 +92,9 @@ ctest -V %{?_smp_mflags}
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat May 15 2021 Martin Gieseking <martin.gieseking@uos.de> - 1.1.9-1
|
||||
- Updated to new release.
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (snappy-1.1.8.tar.gz) = efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
|
||||
SHA512 (snappy-1.1.9.tar.gz) = f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
|
||||
|
||||
Loading…
Reference in New Issue
Block a user