1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00

boost: upgrade 1.76.0 -> 1.77.0

(From OE-Core rev: ef0531a6ac74bb45ed4bfd4a2d870bedecca02cb)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-08-22 14:50:58 +02:00
committed by Richard Purdie
parent 5dadf29a7d
commit 20cb0b322d
3 changed files with 2 additions and 58 deletions
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
BOOST_P = "boost_${BOOST_VER}"
SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
SRC_URI[sha256sum] = "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41"
SRC_URI[sha256sum] = "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854"
UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
@@ -1,54 +0,0 @@
From 6064875bff2e52ba63f01911eb4deb79259c5e3b Mon Sep 17 00:00:00 2001
From: Carlos Miguel Ferreira <carlosmf.pt@gmail.com>
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
Upstream-Status: Submitted [https://github.com/boostorg/regex/pull/132]
Signed-off-by: Carlos Miguel Ferreira <carlosmf.pt@gmail.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
boost/regex/v5/mem_block_cache.hpp | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/boost/regex/v5/mem_block_cache.hpp b/boost/regex/v5/mem_block_cache.hpp
index 0af4eae1..eb3ec776 100644
--- 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;
}
};
--
2.29.2
@@ -1,11 +1,9 @@
require boost-${PV}.inc
require boost.inc
SRC_URI += " \
file://boost-CVE-2012-2677.patch \
SRC_URI += "file://boost-CVE-2012-2677.patch \
file://boost-math-disable-pch-for-gcc.patch \
file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
file://0001-dont-setup-compiler-flags-m32-m64.patch \
file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \
file://0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch \
"