diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-16 09:58:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-17 19:57:32 +0100 |
commit | d34f6683ddb020ae36cbf5519f145b931d123372 (patch) | |
tree | 83fd5be121128611d3c7201feeaf231c24017f6e /meta/recipes-support/boost | |
parent | 37c4ec6028333c3bccf4c333bae02dfbe0d04ee3 (diff) | |
download | poky-d34f6683ddb020ae36cbf5519f145b931d123372.tar.gz |
boost: Compile out stdlib unary/binary_functions for c++11 and newer
These base classes are deprecated/removed from libcpp15
(From OE-Core rev: 27e959638ac9193b502fcebcf037db3df0a7116c)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
-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.79.0.bb | 1 |
2 files changed, 35 insertions, 0 deletions
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 new file mode 100644 index 0000000000..49603348ee --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch | |||
@@ -0,0 +1,34 @@ | |||
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.79.0.bb b/meta/recipes-support/boost/boost_1.79.0.bb index dd5d6eadd6..09e2556790 100644 --- a/meta/recipes-support/boost/boost_1.79.0.bb +++ b/meta/recipes-support/boost/boost_1.79.0.bb | |||
@@ -5,4 +5,5 @@ SRC_URI += "file://boost-CVE-2012-2677.patch \ | |||
5 | file://boost-math-disable-pch-for-gcc.patch \ | 5 | file://boost-math-disable-pch-for-gcc.patch \ |
6 | 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 \ |
7 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | 7 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ |
8 | file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ | ||
8 | " | 9 | " |