From 739c65c54cb0e957df5e9b76f93fb02554e5cac3 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 4 May 2022 23:52:30 +0100 Subject: moved everything to new file formatting --- extra/snappy/cmakelists.patch | 76 ------------------------------------------- extra/snappy/fix-inline.patch | 13 -------- extra/snappy/rtti.patch | 56 ------------------------------- 3 files changed, 145 deletions(-) delete mode 100644 extra/snappy/cmakelists.patch delete mode 100644 extra/snappy/fix-inline.patch delete mode 100644 extra/snappy/rtti.patch (limited to 'extra/snappy') diff --git a/extra/snappy/cmakelists.patch b/extra/snappy/cmakelists.patch deleted file mode 100644 index d6576a8..0000000 --- a/extra/snappy/cmakelists.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -213,19 +219,28 @@ - "snappy-stubs-public.h.in" - "${PROJECT_BINARY_DIR}/snappy-stubs-public.h") - -+# When BUILD_SHARED_LIBS is: -+# ON it will generate a SHARED library -+# OFF it will generate a STATIC library - add_library(snappy "") --target_sources(snappy -- PRIVATE -+ -+# Used to generate both lib types -+if (BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) -+ add_library(snappy_static STATIC "") -+ set_target_properties(snappy_static PROPERTIES OUTPUT_NAME snappy) -+ install(TARGETS snappy_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif () -+ -+set(SNAPPY_SOURCE_PRIVATE - "snappy-internal.h" - "snappy-stubs-internal.h" - "snappy-c.cc" - "snappy-sinksource.cc" - "snappy-stubs-internal.cc" - "snappy.cc" -- "${PROJECT_BINARY_DIR}/config.h" -+ "${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 @@ - $ - $ - $ -- $ --) --target_include_directories(snappy -- PUBLIC -+ $) -+ -+set(SNAPPY_INCLUDE_DIRS - $ - $ -- $ --) -+ $) -+ -+# Only CMake 3.3+ supports PUBLIC sources in targets exported by "install". -+target_sources(snappy PRIVATE ${SNAPPY_SOURCE_PRIVATE} -+ $<$:PUBLIC> ${SNAPPY_SOURCE_PUBLIC}) -+ -+target_include_directories(snappy PUBLIC ${SNAPPY_INCLUDE_DIRS}) -+ -+target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H) -+ -+# Only CMake 3.3+ supports PUBLIC sources in targets exported by "install". -+target_sources(snappy_static PRIVATE ${SNAPPY_SOURCE_PRIVATE} -+ $<$:PUBLIC> ${SNAPPY_SOURCE_PUBLIC}) -+ -+target_include_directories(snappy_static PUBLIC ${SNAPPY_INCLUDE_DIRS}) -+ -+target_compile_definitions(snappy_static PRIVATE -DHAVE_CONFIG_H) -+ - set_target_properties(snappy - PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) - --target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H) - if(BUILD_SHARED_LIBS) - set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - endif(BUILD_SHARED_LIBS) diff --git a/extra/snappy/fix-inline.patch b/extra/snappy/fix-inline.patch deleted file mode 100644 index 96484e0..0000000 --- a/extra/snappy/fix-inline.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch-Source: https://github.com/google/snappy/pull/128 - ---- a/snappy.cc -+++ b/snappy.cc -@@ -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/extra/snappy/rtti.patch b/extra/snappy/rtti.patch deleted file mode 100644 index 80f89ff..0000000 --- a/extra/snappy/rtti.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f73b11e87dfbe1cb4862b8ee489679d99534f40b Mon Sep 17 00:00:00 2001 -From: Tim Serong -Date: Wed, 27 Oct 2021 18:49:04 +1100 -Subject: [PATCH] Re-enable RTTI (needed in order to subclass Source, etc.) - -Commit c98344f in snappy 1.1.9 disabled RTTI, which means the -snappy library no longer exports typeinfo for snappy::Source, -snappy::Sink, ..., so users of the library can't subclass these -classes anymore. - -Here's a trivial reproducer: - - #include - class MySource : snappy::Source { - public: - size_t Available() const override { return 0; } - const char *Peek(size_t *len) override { return NULL; } - void Skip(size_t n) override {} - }; - int main(int argc, char **argv) { - MySource m; - return 0; - } - -Try `g++ -o snappy-test ./snappy-test.cc -lsnappy` with the above -and the linker will fail with "undefined reference to `typeinfo -for snappy::Source'" if RTTI was disabled in the snappy build. ---- - CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6eef485..755605d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "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") - # Use -Wall for clang and gcc. - if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") -@@ -77,9 +73,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - 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") - - # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make -- cgit v1.2.1