diff options
Diffstat (limited to 'mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch')
| -rw-r--r-- | mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch b/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch new file mode 100644 index 000000000000..a6439b465e92 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch @@ -0,0 +1,48 @@ +From 309bb213cffb23e6bee98157b53cf5db31f97ef9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz> +Date: Sat, 21 Aug 2021 11:24:35 +0200 +Subject: [PATCH] Add SYSTEM_FMT cmake option + +This gives packagers option to use system version of fmt rather than +bundled one. It is disabled by default. +--- + +Merged-to-upstream: https://github.com/rspamd/rspamd/pull/3855 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c38758f3..fc4175677 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,7 @@ OPTION(ENABLE_LIBUNWIND "Use libunwind to print crash traces [default: OFF]" + OPTION(ENABLE_LUA_TRACE "Trace all Lua C API invocations [default: OFF]" OFF) + OPTION(ENABLE_LUA_REPL "Enables Lua repl (requires C++11 compiler) [default: ON]" ON) + OPTION(SYSTEM_ZSTD "Use system zstd instead of bundled one [default: OFF]" OFF) ++OPTION(SYSTEM_FMT "Use system fmt instead of bundled one [defalut: OFF]" OFF) + + ############################# INCLUDE SECTION ############################################# + +@@ -117,7 +118,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/" + "${CMAKE_SOURCE_DIR}/contrib/lc-btrie" + "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg" + "${CMAKE_SOURCE_DIR}/contrib/frozen/include" +- "${CMAKE_SOURCE_DIR}/contrib/fmt/include" + "${CMAKE_SOURCE_DIR}/contrib/doctest" + "${CMAKE_SOURCE_DIR}/contrib/fu2/include" + "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir +@@ -650,7 +650,12 @@ ADD_SUBDIRECTORY(contrib/libev) + ADD_SUBDIRECTORY(contrib/kann) + ADD_SUBDIRECTORY(contrib/fastutf8) + ADD_SUBDIRECTORY(contrib/google-ced) +-ADD_SUBDIRECTORY(contrib/fmt) ++IF(SYSTEM_FMT MATCHES "OFF") ++ ADD_SUBDIRECTORY(contrib/fmt) ++ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/fmt/include") ++ELSE() ++ find_package(fmt) ++ENDIF() + ADD_SUBDIRECTORY(contrib/doctest) + + IF (NOT WITH_LUAJIT) +-- +2.31.1 + |