diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-08-22 14:50:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-23 08:25:53 +0100 |
commit | 20cb0b322d900d28fd371993b1408469799a3ad7 (patch) | |
tree | 254421d4afe19208aa1ece6aff05cb51ff3d4216 | |
parent | 5dadf29a7d5e4197c1ebd0fef8db18a051aee159 (diff) | |
download | poky-20cb0b322d900d28fd371993b1408469799a3ad7.tar.gz |
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>
-rw-r--r-- | meta/recipes-support/boost/boost-1.77.0.inc (renamed from meta/recipes-support/boost/boost-1.76.0.inc) | 2 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch | 54 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.77.0.bb (renamed from meta/recipes-support/boost/boost_1.76.0.bb) | 4 |
3 files changed, 2 insertions, 58 deletions
diff --git a/meta/recipes-support/boost/boost-1.76.0.inc b/meta/recipes-support/boost/boost-1.77.0.inc index c02f38b047..6df06e76c7 100644 --- a/meta/recipes-support/boost/boost-1.76.0.inc +++ b/meta/recipes-support/boost/boost-1.77.0.inc | |||
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" | |||
12 | BOOST_P = "boost_${BOOST_VER}" | 12 | BOOST_P = "boost_${BOOST_VER}" |
13 | 13 | ||
14 | SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" |
15 | SRC_URI[sha256sum] = "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" | 15 | SRC_URI[sha256sum] = "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" | 17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" |
18 | UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" | 18 | UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" |
diff --git a/meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch b/meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch deleted file mode 100644 index a8305ff2e0..0000000000 --- a/meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 6064875bff2e52ba63f01911eb4deb79259c5e3b Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Miguel Ferreira <carlosmf.pt@gmail.com> | ||
3 | Date: Thu, 3 Jun 2021 23:10:37 +0100 | ||
4 | Subject: [PATCH] Fixes wrong type for mutex in regex v5 | ||
5 | |||
6 | With the Boost.Regex to ehader-only library, the declaration | ||
7 | of a mutex that should have been changed from boost::static_mutex | ||
8 | to std::mutex was left behind. This was preventing regex from | ||
9 | being built for older arm platforms [1] | ||
10 | |||
11 | [1]: https://github.com/openwrt/packages/issues/15725 | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/boostorg/regex/pull/132] | ||
14 | |||
15 | Signed-off-by: Carlos Miguel Ferreira <carlosmf.pt@gmail.com> | ||
16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
17 | --- | ||
18 | boost/regex/v5/mem_block_cache.hpp | 12 ++++-------- | ||
19 | 1 file changed, 4 insertions(+), 8 deletions(-) | ||
20 | |||
21 | diff --git a/boost/regex/v5/mem_block_cache.hpp b/boost/regex/v5/mem_block_cache.hpp | ||
22 | index 0af4eae1..eb3ec776 100644 | ||
23 | --- a/boost/regex/v5/mem_block_cache.hpp | ||
24 | +++ b/boost/regex/v5/mem_block_cache.hpp | ||
25 | @@ -85,10 +85,10 @@ struct mem_block_node | ||
26 | struct mem_block_cache | ||
27 | { | ||
28 | // this member has to be statically initialsed: | ||
29 | - mem_block_node* next; | ||
30 | - unsigned cached_blocks; | ||
31 | + mem_block_node* next { nullptr }; | ||
32 | + unsigned cached_blocks { 0 }; | ||
33 | #ifdef BOOST_HAS_THREADS | ||
34 | - boost::static_mutex mut; | ||
35 | + std::mutex mut; | ||
36 | #endif | ||
37 | |||
38 | ~mem_block_cache() | ||
39 | @@ -133,11 +133,7 @@ struct mem_block_cache | ||
40 | } | ||
41 | static mem_block_cache& instance() | ||
42 | { | ||
43 | -#ifdef BOOST_HAS_THREADS | ||
44 | - static mem_block_cache block_cache = { 0, 0, BOOST_STATIC_MUTEX_INIT, }; | ||
45 | -#else | ||
46 | - static mem_block_cache block_cache = { 0, 0, }; | ||
47 | -#endif | ||
48 | + static mem_block_cache block_cache; | ||
49 | return block_cache; | ||
50 | } | ||
51 | }; | ||
52 | -- | ||
53 | 2.29.2 | ||
54 | |||
diff --git a/meta/recipes-support/boost/boost_1.76.0.bb b/meta/recipes-support/boost/boost_1.77.0.bb index ae91b1c875..df8e08ad76 100644 --- a/meta/recipes-support/boost/boost_1.76.0.bb +++ b/meta/recipes-support/boost/boost_1.77.0.bb | |||
@@ -1,11 +1,9 @@ | |||
1 | require boost-${PV}.inc | 1 | require boost-${PV}.inc |
2 | require boost.inc | 2 | require boost.inc |
3 | 3 | ||
4 | SRC_URI += " \ | 4 | SRC_URI += "file://boost-CVE-2012-2677.patch \ |
5 | file://boost-CVE-2012-2677.patch \ | ||
6 | file://boost-math-disable-pch-for-gcc.patch \ | 5 | file://boost-math-disable-pch-for-gcc.patch \ |
7 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 6 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
8 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | 7 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ |
9 | file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ | 8 | file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ |
10 | file://0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch \ | ||
11 | " | 9 | " |