diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2022-12-21 10:59:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-22 23:05:50 +0000 |
commit | 21233a320ba15e7b2bad64233a8356d23ea165cb (patch) | |
tree | c29c8d5ce53e3afd1104d0ec09f5b084d951b8df /meta | |
parent | 98f1b3d6ae6b6ac06f993bc0caa15fa93bce7ddf (diff) | |
download | poky-21233a320ba15e7b2bad64233a8356d23ea165cb.tar.gz |
boost: upgrade 1.80.0 -> 1.81.0
0001-The-std-lib-unary-binary_function-base-classes-are-d.patch
removed since it's included in 1.81.0
(From OE-Core rev: 16d33730845895dac7e6fa1e03778ca49b37adce)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/boost/boost-1.81.0.inc (renamed from meta/recipes-support/boost/boost-1.80.0.inc) | 2 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch | 34 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.81.0.bb (renamed from meta/recipes-support/boost/boost_1.80.0.bb) | 1 |
3 files changed, 1 insertions, 36 deletions
diff --git a/meta/recipes-support/boost/boost-1.80.0.inc b/meta/recipes-support/boost/boost-1.81.0.inc index 3ee82eb9b2..291796c736 100644 --- a/meta/recipes-support/boost/boost-1.80.0.inc +++ b/meta/recipes-support/boost/boost-1.81.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] = "1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0" | 15 | SRC_URI[sha256sum] = "71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa" |
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-The-std-lib-unary-binary_function-base-classes-are-d.patch b/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch deleted file mode 100644 index 49603348ee..0000000000 --- a/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From f9b55f5a1fab85bf73c95e6372779d6f50f75e84 Mon Sep 17 00:00:00 2001 | ||
2 | From: jzmaddock <john@johnmaddock.co.uk> | ||
3 | Date: Mon, 11 Jul 2022 18:26:07 +0100 | ||
4 | Subject: [PATCH] The std lib unary/binary_function base classes are | ||
5 | deprecated/removed from libcpp15. Fixes | ||
6 | https://github.com/boostorg/container_hash/issues/24. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/boostorg/config/pull/440/commits/f0af4a9184457939b89110795ae2d293582c5f66] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | boost/config/stdlib/libcpp.hpp | 9 +++++++++ | ||
12 | 1 file changed, 9 insertions(+) | ||
13 | |||
14 | diff --git a/boost/config/stdlib/libcpp.hpp b/boost/config/stdlib/libcpp.hpp | ||
15 | index bc8536ead..0e9f2445e 100644 | ||
16 | --- a/boost/config/stdlib/libcpp.hpp | ||
17 | +++ b/boost/config/stdlib/libcpp.hpp | ||
18 | @@ -168,4 +168,13 @@ | ||
19 | # define BOOST_NO_CXX14_HDR_SHARED_MUTEX | ||
20 | #endif | ||
21 | |||
22 | +#if _LIBCPP_VERSION >= 15000 | ||
23 | +// | ||
24 | +// Unary function is now deprecated in C++11 and later: | ||
25 | +// | ||
26 | +#if __cplusplus >= 201103L | ||
27 | +#define BOOST_NO_CXX98_FUNCTION_BASE | ||
28 | +#endif | ||
29 | +#endif | ||
30 | + | ||
31 | // --- end --- | ||
32 | -- | ||
33 | 2.37.2 | ||
34 | |||
diff --git a/meta/recipes-support/boost/boost_1.80.0.bb b/meta/recipes-support/boost/boost_1.81.0.bb index c34ab7d703..4b580d078b 100644 --- a/meta/recipes-support/boost/boost_1.80.0.bb +++ b/meta/recipes-support/boost/boost_1.81.0.bb | |||
@@ -4,5 +4,4 @@ require boost.inc | |||
4 | SRC_URI += "file://boost-math-disable-pch-for-gcc.patch \ | 4 | SRC_URI += "file://boost-math-disable-pch-for-gcc.patch \ |
5 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 5 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
6 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | 6 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ |
7 | file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ | ||
8 | " | 7 | " |