diff --git a/system/base/snappy/actions.py b/system/base/snappy/actions.py
index 3bd5d08a..6585aeb0 100644
--- a/system/base/snappy/actions.py
+++ b/system/base/snappy/actions.py
@@ -20,15 +20,19 @@ def setup():
#pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
cmaketools.configure("-DBUILD_SHARED_LIBS=ON \
+ -DSNAPPY_BUILD_TESTS=OFF \
+ -DSNAPPY_BUILD_BENCHMARKS=OFF \
-DCMAKE_INSTALL_LIBDIR=lib")
+
+
def build():
cmaketools.make()
-def check():
- cmaketools.make("test")
+#def check():
+ #cmaketools.make("test")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
- pisitools.dodoc("README.md", "COPYING", "AUTHORS")
\ No newline at end of file
+ pisitools.dodoc("README.md", "COPYING", "AUTHORS")
diff --git a/system/base/snappy/files/snappy-inline.patch b/system/base/snappy/files/snappy-inline.patch
new file mode 100644
index 00000000..46ed4253
--- /dev/null
+++ b/system/base/snappy/files/snappy-inline.patch
@@ -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
diff --git a/system/base/snappy/files/snappy-thirdparty.patch b/system/base/snappy/files/snappy-thirdparty.patch
new file mode 100644
index 00000000..894fbe98
--- /dev/null
+++ b/system/base/snappy/files/snappy-thirdparty.patch
@@ -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)
diff --git a/system/base/snappy/pspec.xml b/system/base/snappy/pspec.xml
index 2e4fd113..ab4d2acb 100644
--- a/system/base/snappy/pspec.xml
+++ b/system/base/snappy/pspec.xml
@@ -14,12 +14,14 @@
Snappy is a compression/decompression library. It does not aim for maximum compression, or compatibility with any other compression library; instead, it aims for very high speeds and reasonable compression.
lzo-devel
+ lz4-devel
zlib-devel
cmake
- https://github.com/google/snappy/archive/1.1.8.tar.gz
+ https://github.com/google/snappy/archive/1.1.9.tar.gz
-
+ snappy-thirdparty.patch
+ snappy-inline.patch
@@ -47,6 +49,13 @@
+
+ 2021-06-03
+ 1.1.9
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2020-12-09
1.1.8