From 34a91f7be31d1591f81c0cf53eaf0a2a94e54539 Mon Sep 17 00:00:00 2001 From: Carlos Miguel Ferreira Date: Thu, 3 Jun 2021 23:05:10 +0100 Subject: [PATCH] boost: Fixes Boost.regex header-only (v5) include In v1.76.0 Boost.Regex became a header-only library. With this update, there are now two different versions: - v4 for C++03 (deprecated) - v5 header-only This commit fixes an issue which was preventing Boost.Regex from being built for old ArmV5 targets Signed-off-by: Carlos Miguel Ferreira --- libs/boost/patches/020-regex.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 libs/boost/patches/020-regex.patch diff --git a/libs/boost/patches/020-regex.patch b/libs/boost/patches/020-regex.patch new file mode 100644 index 0000000000..606d2223a5 --- /dev/null +++ b/libs/boost/patches/020-regex.patch @@ -0,0 +1,29 @@ +--- a/boost/regex/v5/mem_block_cache.hpp ++++ b/boost/regex/v5/mem_block_cache.hpp +@@ -85,10 +85,10 @@ struct mem_block_node + struct mem_block_cache + { + // this member has to be statically initialsed: +- mem_block_node* next; +- unsigned cached_blocks; ++ mem_block_node* next { nullptr }; ++ unsigned cached_blocks { 0 }; + #ifdef BOOST_HAS_THREADS +- boost::static_mutex mut; ++ std::mutex mut; + #endif + + ~mem_block_cache() +@@ -133,11 +133,7 @@ struct mem_block_cache + } + static mem_block_cache& instance() + { +-#ifdef BOOST_HAS_THREADS +- static mem_block_cache block_cache = { 0, 0, BOOST_STATIC_MUTEX_INIT, }; +-#else +- static mem_block_cache block_cache = { 0, 0, }; +-#endif ++ static mem_block_cache block_cache; + return block_cache; + } + };