diff options
Diffstat (limited to 'poky/meta/recipes-support/boost')
-rw-r--r-- | poky/meta/recipes-support/boost/bjam-native_1.72.0.bb (renamed from poky/meta/recipes-support/boost/bjam-native_1.71.0.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost-1.72.0.inc (renamed from poky/meta/recipes-support/boost/boost-1.71.0.inc) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost.inc | 5 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost_1.72.0.bb (renamed from poky/meta/recipes-support/boost/boost_1.71.0.bb) | 1 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch | 53 |
5 files changed, 61 insertions, 2 deletions
diff --git a/poky/meta/recipes-support/boost/bjam-native_1.71.0.bb b/poky/meta/recipes-support/boost/bjam-native_1.72.0.bb index d843eb038..d843eb038 100644 --- a/poky/meta/recipes-support/boost/bjam-native_1.71.0.bb +++ b/poky/meta/recipes-support/boost/bjam-native_1.72.0.bb diff --git a/poky/meta/recipes-support/boost/boost-1.71.0.inc b/poky/meta/recipes-support/boost/boost-1.72.0.inc index 7164d0f1c..55a095bf1 100644 --- a/poky/meta/recipes-support/boost/boost-1.71.0.inc +++ b/poky/meta/recipes-support/boost/boost-1.72.0.inc @@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "4cdf9b5c2dc01fb2b7b733d5af30e558" -SRC_URI[sha256sum] = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee" +SRC_URI[md5sum] = "cb40943d2a2cb8ce08d42bc48b0f84f0" +SRC_URI[sha256sum] = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" diff --git a/poky/meta/recipes-support/boost/boost.inc b/poky/meta/recipes-support/boost/boost.inc index e15dce4e1..8eb949438 100644 --- a/poky/meta/recipes-support/boost/boost.inc +++ b/poky/meta/recipes-support/boost/boost.inc @@ -202,6 +202,11 @@ do_install() { fi done + # Cmake files reference full paths to image + find ${D}${libdir}/cmake -type f | \ + grep 'cmake$' | \ + xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i + } BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/boost/boost_1.71.0.bb b/poky/meta/recipes-support/boost/boost_1.72.0.bb index 5e9e0d87d..0b7badbc7 100644 --- a/poky/meta/recipes-support/boost/boost_1.71.0.bb +++ b/poky/meta/recipes-support/boost/boost_1.72.0.bb @@ -7,4 +7,5 @@ SRC_URI += "file://arm-intrinsics.patch \ file://0001-Apply-boost-1.62.0-no-forced-flags.patch.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-revert-cease-dependence-on-range.patch \ " diff --git a/poky/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch b/poky/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch new file mode 100644 index 000000000..d6d09a23a --- /dev/null +++ b/poky/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch @@ -0,0 +1,53 @@ +From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 +From: Oliver Kowalke <oliver.kowalke@gmail.com> +Date: Sun, 1 Dec 2019 20:40:28 +0100 +Subject: [PATCH] Revert "Cease dependence on Range" + +This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. + +see #44 (One test fails to compile after boostorg/coroutine submodule updated) + +Upstream-Status: Backport [https://github.com/boostorg/coroutine/commit/9c73b2f7c1759a9508ba8780b38dc15f07f1a447] + +Signed-off-by: Andrew Geissler <geissonator@gmail.com> +--- + boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp +index ea96981..640896f 100644 +--- a/boost/coroutine/asymmetric_coroutine.hpp ++++ b/boost/coroutine/asymmetric_coroutine.hpp +@@ -14,6 +14,7 @@ + #include <boost/assert.hpp> + #include <boost/config.hpp> + #include <boost/move/move.hpp> ++#include <boost/range.hpp> + #include <boost/throw_exception.hpp> + #include <boost/utility/explicit_operator_bool.hpp> + +@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) + + } + +-// forward declaration of Boost.Range traits to break dependency on it +-template<typename C, typename Enabler> +-struct range_mutable_iterator; +- +-template<typename C, typename Enabler> +-struct range_const_iterator; +- + template< typename Arg > +-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > ++struct range_mutable_iterator< coroutines::push_coroutine< Arg > > + { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; + + template< typename R > +-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > ++struct range_mutable_iterator< coroutines::pull_coroutine< R > > + { typedef typename coroutines::pull_coroutine< R >::iterator type; }; + + } +-- +2.24.1 + |