diff options
| author | Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> | 2017-05-15 14:54:32 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-30 10:15:19 +0100 |
| commit | ad9c4140bd7a7662c636efd12ac22492c64d7807 (patch) | |
| tree | 575308b2e03eeddad8579bdb7e49cfef913d77a6 /meta/recipes-support/boost | |
| parent | 27200a3afd606df7f8e592439a8dd403d714ea6f (diff) | |
| download | poky-ad9c4140bd7a7662c636efd12ac22492c64d7807.tar.gz | |
boost: backport a regression fix for forgotten header
The v1.64 release has broken array serialization code with issues
reported in
https://svn.boost.org/trac/boost/ticket/12516
https://github.com/bmwcarit/meta-ros/issues/505
Backport the fix from boost::serialization's master.
(From OE-Core rev: e1da4cc99e57c596b2a354767cc1e261718dac52)
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.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-correct-error-which-appeared-when-compiling-non-c-co.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost_1.64.0.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch b/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch new file mode 100644 index 0000000000..2598d2b175 --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 02fa5cee1b8d0321787113e2dc10b162c657f333 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Ramey <ramey@rrsd.com> | ||
| 3 | Date: Wed, 1 Feb 2017 16:43:59 -0800 | ||
| 4 | Subject: [PATCH] correct error which appeared when compiling non c++ compliant | ||
| 5 | code for arrays | ||
| 6 | |||
| 7 | Upstream-Status: Backported [expected to be released in v1.65] | ||
| 8 | |||
| 9 | --- | ||
| 10 | boost/serialization/array.hpp | 2 ++ | ||
| 11 | 1 file changed, 2 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/boost/serialization/array.hpp b/boost/serialization/array.hpp | ||
| 14 | index 61708b3..612d1a6 100644 | ||
| 15 | --- a/boost/serialization/array.hpp | ||
| 16 | +++ b/boost/serialization/array.hpp | ||
| 17 | @@ -23,6 +23,8 @@ namespace std{ | ||
| 18 | } // namespace std | ||
| 19 | #endif | ||
| 20 | |||
| 21 | +#include <boost/serialization/array_wrapper.hpp> | ||
| 22 | + | ||
| 23 | #ifndef BOOST_NO_CXX11_HDR_ARRAY | ||
| 24 | |||
| 25 | #include <array> | ||
| 26 | -- | ||
| 27 | 2.9.3 | ||
| 28 | |||
diff --git a/meta/recipes-support/boost/boost_1.64.0.bb b/meta/recipes-support/boost/boost_1.64.0.bb index 119eb0af45..d1c20e1d06 100644 --- a/meta/recipes-support/boost/boost_1.64.0.bb +++ b/meta/recipes-support/boost/boost_1.64.0.bb | |||
| @@ -9,4 +9,5 @@ SRC_URI += "\ | |||
| 9 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ | 9 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ |
| 10 | file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 10 | file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
| 11 | file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ | 11 | file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ |
| 12 | file://0001-correct-error-which-appeared-when-compiling-non-c-co.patch \ | ||
| 12 | " | 13 | " |
