diff --git a/app-arch/snappy/patches/snappy-1.1.9.patchset b/app-arch/snappy/patches/snappy-1.1.10.patchset similarity index 56% rename from app-arch/snappy/patches/snappy-1.1.9.patchset rename to app-arch/snappy/patches/snappy-1.1.10.patchset index 6cca30426..00c1afbab 100644 --- a/app-arch/snappy/patches/snappy-1.1.9.patchset +++ b/app-arch/snappy/patches/snappy-1.1.10.patchset @@ -1,72 +1,4 @@ -From c8ec7984fa9f647a70a22dfa396194e5f633b4b8 Mon Sep 17 00:00:00 2001 -From: "Georgi D. Sotirov" -Date: Wed, 5 May 2021 14:16:46 +0300 -Subject: Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE - -Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to -fix the following compilation errors and a warning with GCC: - -[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o -/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS --I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 --march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 --DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c -/tmp/snappy-1.1.9/snappy.cc -/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline -function might not be inlinable [-Wattributes] - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair snappy::DecompressBranchless(const uint8_t*, const -uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned -char; ptrdiff_t = int]': -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, -size_t*)': function body can be overwritten at link time - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - ^ -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here - size_t tag_type = AdvanceToNextTag(&ip, &tag); - ^ -CMakeFiles/snappy.dir/build.make:137: recipe for target -'CMakeFiles/snappy.dir/snappy.cc.o' failed - -Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE -macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ -inline specifier. - -diff --git a/snappy.cc b/snappy.cc -index 79dc0e8..51157be 100644 ---- a/snappy.cc -+++ b/snappy.cc -@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { - } - - 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 --- -2.30.2 - - -From 43f605eed88d92a3efafe63d6983c212cc362c2f Mon Sep 17 00:00:00 2001 +From 8f8c2b6a944af7eff9b04afa449f750f5ce2b17e Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 9 Jul 2021 16:57:35 +0200 Subject: Add a switch to use system gtest and benchmark @@ -75,8 +7,9 @@ Allow to use the gtest and benchmark libraries from the system. Use pkg-config to check that the libraries are installed and to add the correct cflags/link flags. + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 672561e..eb2a743 100644 +index c3062e2..3b832a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,14 @@ option(SNAPPY_BUILD_TESTS "Build Snappy's own tests." ON) @@ -94,7 +27,7 @@ index 672561e..eb2a743 100644 option(SNAPPY_FUZZING_BUILD "Build Snappy for fuzzing." OFF) option(SNAPPY_REQUIRE_AVX "Target processors with AVX support." OFF) -@@ -284,29 +292,40 @@ endif(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) +@@ -306,29 +314,40 @@ endif(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) if(SNAPPY_BUILD_TESTS) enable_testing() @@ -152,7 +85,7 @@ index 672561e..eb2a743 100644 add_test( NAME snappy_unittest -@@ -322,17 +341,28 @@ if(SNAPPY_BUILD_TESTS) +@@ -344,17 +363,28 @@ if(SNAPPY_BUILD_TESTS) endif(SNAPPY_BUILD_TESTS) if(SNAPPY_BUILD_BENCHMARKS) @@ -183,5 +116,5 @@ index 672561e..eb2a743 100644 if(SNAPPY_FUZZING_BUILD) -- -2.30.2 +2.37.3 diff --git a/app-arch/snappy/snappy-1.1.9.recipe b/app-arch/snappy/snappy-1.1.10.recipe similarity index 96% rename from app-arch/snappy/snappy-1.1.9.recipe rename to app-arch/snappy/snappy-1.1.10.recipe index 9d20df47a..d7757d802 100644 --- a/app-arch/snappy/snappy-1.1.9.recipe +++ b/app-arch/snappy/snappy-1.1.10.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2005-2017 Google Inc" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://github.com/google/snappy/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7" +CHECKSUM_SHA256="49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90" PATCHES="snappy-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2"