diff --git a/libboost-1.76.0-arm-upstream-fix-build.patch b/libboost-1.76.0-arm-upstream-fix-build.patch new file mode 100644 index 0000000..5b97e3d --- /dev/null +++ b/libboost-1.76.0-arm-upstream-fix-build.patch @@ -0,0 +1,48 @@ +From 6064875bff2e52ba63f01911eb4deb79259c5e3b Mon Sep 17 00:00:00 2001 +From: Carlos Miguel Ferreira +Date: Thu, 3 Jun 2021 23:10:37 +0100 +Subject: [PATCH] Fixes wrong type for mutex in regex v5 + +With the Boost.Regex to ehader-only library, the declaration +of a mutex that should have been changed from boost::static_mutex +to std::mutex was left behind. This was preventing regex from +being built for older arm platforms [1] + +[1]: https://github.com/openwrt/packages/issues/15725 + +Signed-off-by: Carlos Miguel Ferreira +--- + include/boost/regex/v5/mem_block_cache.hpp | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/include/boost/regex/v5/mem_block_cache.hpp b/include/boost/regex/v5/mem_block_cache.hpp +index 0af4eae18..eb3ec776c 100644 +--- a/include/boost/regex/v5/mem_block_cache.hpp ++++ b/include/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; + } + }; diff --git a/libboost.spec b/libboost.spec index 2dab096..882eba9 100644 --- a/libboost.spec +++ b/libboost.spec @@ -1,22 +1,22 @@ %define pckver %(echo %version | tr . _) %define pckmajver %(echo %version | cut -d. -f1-2 | tr . _) Name: libboost -Version: 1.75.0 -Release: 2mamba +Version: 1.76.0 +Release: 1mamba Summary: Free peer-reviewed portable C++ source libraries Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://boost.org/ +URL: https://boost.org/ Source: https://dl.bintray.com/boostorg/release/%{version}/source/boost_%{pckver}.tar.bz2 #Source: http://download.sourceforge.net/sourceforge/boost/boost_%{pckver}.tar.bz2 Patch0: libboost-1.57.0-moc-libqt4-4.8.6.patch Patch1: libboost-1.58.0-python-3.3.patch +Patch2: libboost-1.76.0-arm-upstream-fix-build.patch License: Boost Software License ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig BuildRequires: libbzip2-devel BuildRequires: libgcc BuildRequires: libicu-devel @@ -82,6 +82,7 @@ cp -a boost_python boost_python36 #%patch0 -p1 #%patch1 -p1 +%patch2 -p2 %build #:<< _EOF @@ -302,11 +303,12 @@ EXPAT_LIBPATH=%{_libdir} \ %{_libdir}/boost-python3*/mpi.so %{_libdir}/libboost_python3*.so.* %{_libdir}/libboost_mpi_python3*.so.* -%ifnarch arm %{_libdir}/libboost_numpy3*.so.* -%endif %changelog +* Tue Apr 20 2021 Automatic Build System 1.76.0-1mamba +- automatic version update by autodist + * Tue Jan 19 2021 Silvan Calarco 1.75.0-2mamba - libboost-devel: restore libboost_[python|numpy]3.so symlinks