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:28 +0100 |
commit | 27e959638ac9193b502fcebcf037db3df0a7116c (patch) | |
tree | 2d776054cb3bb180869019bb21abd3be1919691f /meta | |
parent | b92dfcb4b02f6f0971ff5f78b9c6ef4ab751e889 (diff) | |
download | openembedded-core-27e959638ac9193b502fcebcf037db3df0a7116c.tar.gz |
boost: Compile out stdlib unary/binary_functions for c++11 and newer
These base classes are deprecated/removed from libcpp15
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@ +From f9b55f5a1fab85bf73c95e6372779d6f50f75e84 Mon Sep 17 00:00:00 2001 +From: jzmaddock <john@johnmaddock.co.uk> +Date: Mon, 11 Jul 2022 18:26:07 +0100 +Subject: [PATCH] The std lib unary/binary_function base classes are + deprecated/removed from libcpp15. Fixes + https://github.com/boostorg/container_hash/issues/24. + +Upstream-Status: Backport [https://github.com/boostorg/config/pull/440/commits/f0af4a9184457939b89110795ae2d293582c5f66] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + boost/config/stdlib/libcpp.hpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/boost/config/stdlib/libcpp.hpp b/boost/config/stdlib/libcpp.hpp +index bc8536ead..0e9f2445e 100644 +--- a/boost/config/stdlib/libcpp.hpp ++++ b/boost/config/stdlib/libcpp.hpp +@@ -168,4 +168,13 @@ + # define BOOST_NO_CXX14_HDR_SHARED_MUTEX + #endif + ++#if _LIBCPP_VERSION >= 15000 ++// ++// Unary function is now deprecated in C++11 and later: ++// ++#if __cplusplus >= 201103L ++#define BOOST_NO_CXX98_FUNCTION_BASE ++#endif ++#endif ++ + // --- end --- +-- +2.37.2 + 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 \ 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-The-std-lib-unary-binary_function-base-classes-are-d.patch \ " |