diff --git a/snappy.yaml b/snappy.yaml index c6694808528..0d87ee7a1c0 100644 --- a/snappy.yaml +++ b/snappy.yaml @@ -1,7 +1,7 @@ package: name: snappy - version: 1.2.1 - epoch: 2 + version: "1.2.2" + epoch: 0 description: Fast compression and decompression library copyright: - license: BSD-3-Clause @@ -22,7 +22,7 @@ pipeline: with: repository: https://github.com/google/snappy tag: ${{package.version}} - expected-commit: 2c94e11145f0b7b184b831577c93e5a41c4c0346 + expected-commit: 6af9287fbdb913f0794d0148c6aa43b58e63c8e3 - uses: patch with: diff --git a/snappy/cmakelists.patch b/snappy/cmakelists.patch index 9c168534dd5..ad6ce848b06 100644 --- a/snappy/cmakelists.patch +++ b/snappy/cmakelists.patch @@ -1,6 +1,8 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd71a47..4c1b623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -86,6 +86,8 @@ +@@ -91,6 +91,8 @@ endif(MSVC) # it prominent in the GUI. option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF) @@ -9,7 +11,7 @@ option(SNAPPY_BUILD_TESTS "Build Snappy's own tests." ON) option(SNAPPY_BUILD_BENCHMARKS "Build Snappy's benchmarks" ON) -@@ -98,6 +100,10 @@ +@@ -103,6 +105,10 @@ option(SNAPPY_REQUIRE_AVX2 "Target processors with AVX2 support." OFF) option(SNAPPY_INSTALL "Install Snappy's header and library" ON) @@ -20,7 +22,7 @@ include(TestBigEndian) test_big_endian(SNAPPY_IS_BIG_ENDIAN) -@@ -213,19 +219,28 @@ +@@ -251,17 +257,28 @@ configure_file( "snappy-stubs-public.h.in" "${PROJECT_BINARY_DIR}/snappy-stubs-public.h") @@ -46,15 +48,14 @@ "snappy-stubs-internal.cc" "snappy.cc" - "${PROJECT_BINARY_DIR}/config.h" +- PUBLIC + "${PROJECT_BINARY_DIR}/config.h") - -- # Only CMake 3.3+ supports PUBLIC sources in targets exported by "install". -- $<$:PUBLIC> ++ +set(SNAPPY_SOURCE_PUBLIC $ $ $ -@@ -233,18 +248,32 @@ +@@ -269,18 +286,32 @@ target_sources(snappy $ $ $ diff --git a/snappy/rtti.patch b/snappy/rtti.patch index 80f89ffd781..aba84bd4085 100644 --- a/snappy/rtti.patch +++ b/snappy/rtti.patch @@ -30,10 +30,10 @@ for snappy::Source'" if RTTI was disabled in the snappy build. 1 file changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6eef485..755605d 100644 +index 4c1b623..bdfeccc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +@@ -51,10 +51,6 @@ if(MSVC) string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-") add_definitions(-D_HAS_EXCEPTIONS=0) @@ -41,16 +41,17 @@ index 6eef485..755605d 100644 - # Disable RTTI. - string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") - else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + else(MSVC) # Use -Wall for clang and gcc. if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") -@@ -77,9 +73,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +@@ -81,10 +77,6 @@ else(MSVC) + # Disable C++ exceptions. string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") - +- - # Disable RTTI. - string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") - endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + endif(MSVC) # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make