Skip to content
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
6 changes: 3 additions & 3 deletions snappy.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,7 +22,7 @@ pipeline:
with:
repository: https://github.com/google/snappy
tag: ${{package.version}}
expected-commit: 2c94e11145f0b7b184b831577c93e5a41c4c0346
expected-commit: 6af9287fbdb913f0794d0148c6aa43b58e63c8e3

- uses: patch
with:
Expand Down
15 changes: 8 additions & 7 deletions snappy/cmakelists.patch
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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)

Expand All @@ -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")

Expand All @@ -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".
- $<$<VERSION_GREATER:CMAKE_VERSION,3.2>:PUBLIC>
+
+set(SNAPPY_SOURCE_PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-c.h>
$<INSTALL_INTERFACE:include/snappy-c.h>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-sinksource.h>
@@ -233,18 +248,32 @@
@@ -269,18 +286,32 @@ target_sources(snappy
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy.h>
$<INSTALL_INTERFACE:include/snappy.h>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
Expand Down
13 changes: 7 additions & 6 deletions snappy/rtti.patch
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,28 @@ 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)
-
- # 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
Loading