summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/boost/boost
diff options
context:
space:
mode:
authorLukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>2016-01-06 18:31:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 23:26:30 +0000
commitcd2cf1f654389b872e6586a120774df2067fb6d2 (patch)
treeeb9957ae1e87bcb3e85f00447000567042d7cd83 /meta/recipes-support/boost/boost
parentafc0255f5a1d0b8d2b3a76d57d797c03edb48cf2 (diff)
downloadpoky-cd2cf1f654389b872e6586a120774df2067fb6d2.tar.gz
boost: update to 1.60.0
Due to the version update to 1.59.0, the two patches previously backported in this recipe are now dropped. The actual status of the arm-intrinsics.patch (reported with Upstream-Status: Backport) is unknown to the committer, and hence, that patch is kept in the recipe, even if it is possibly not required anymore. A deeper analysis is required to determine need and status of that patch. Second, boost 1.59.0 provides a new library, called timer, which is packaged as further library in the boost recipe. The update to boost 1.60.0 required no further changes beyond changing the checksum hashes. Third, on PPC architectures, qemuppc & mpc8315e-rdb [1] (tested by Ross Burton), the boost test library with the vanilla version 1.60.0 fails with: | gcc.compile.c++ bin.v2/libs/test/build/aca09349fdb84d131321425f6c3a38ed/execution_monitor.o | In file included from [...]/tmp/sysroots/mpc8315e-rdb/usr/include/fenv.h:114:0, | from [...]/tmp/sysroots/mpc8315e-rdb/usr/include/c++/5.3.0/fenv.h:36, | from ./boost/detail/fenv.hpp:97, | from ./boost/test/execution_monitor.hpp:64, | from ./boost/test/impl/execution_monitor.ipp:31, | from libs/test/src/execution_monitor.cpp:16: | ./boost/test/impl/execution_monitor.ipp: In function 'unsigned int boost::fpe::enable(unsigned int)': | ./boost/test/impl/execution_monitor.ipp:1383:7: error: expected id-expression before '(' token | ::feclearexcept(BOOST_FPE_ALL); | ^ | ./boost/test/impl/execution_monitor.ipp: In function 'unsigned int boost::fpe::disable(unsigned int)': | ./boost/test/impl/execution_monitor.ipp:1420:7: error: expected id-expression before '(' token | ::feclearexcept(BOOST_FPE_ALL); | ^ The commit f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 from the boostorg/test github repository (branch: develop) [2] addresses that issue, but it was not merged in the 1.60.0 release. This commit adds this upstream-accepted patch, which was created by: `git checkout f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 && git format-patch -1` [1] http://lists.openembedded.org/pipermail/openembedded-core/2016-January/114844.html [2] https://github.com/boostorg/test/commit/f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 (From OE-Core rev: 17d77db5e1203e18cdd178e7d9a457310425ebdc) Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost/boost')
-rw-r--r--meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch b/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
new file mode 100644
index 0000000000..df7e71fea6
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
@@ -0,0 +1,45 @@
1From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001
2From: Jonathan Wakely <jwakely@redhat.com>
3Date: Mon, 14 Sep 2015 15:05:24 +0100
4Subject: [PATCH] Do not qualify <fenv.h> names that might be macros.
5
6The patch was imported from the boost-test git repository
7(https://github.com/boostorg/test) as of commit id
8f50e7bc9fed323c5705c0ed992c03e80eeec1dd6.
9
10Upstream-Status: Accepted [commit f50e7bc9fed in develop branch]
11
12Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
13---
14 include/boost/test/impl/execution_monitor.ipp | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp
18index b3e873e..a7bdce2 100644
19--- a/include/boost/test/impl/execution_monitor.ipp
20+++ b/include/boost/test/impl/execution_monitor.ipp
21@@ -1380,8 +1380,8 @@ enable( unsigned mask )
22
23 return ~old_cw & BOOST_FPE_ALL;
24 #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
25- ::feclearexcept(BOOST_FPE_ALL);
26- int res = ::feenableexcept( mask );
27+ feclearexcept(BOOST_FPE_ALL);
28+ int res = feenableexcept( mask );
29 return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
30 #else
31 /* Not Implemented */
32@@ -1417,8 +1417,8 @@ disable( unsigned mask )
33
34 return ~old_cw & BOOST_FPE_ALL;
35 #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
36- ::feclearexcept(BOOST_FPE_ALL);
37- int res = ::fedisableexcept( mask );
38+ feclearexcept(BOOST_FPE_ALL);
39+ int res = fedisableexcept( mask );
40 return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
41 #else
42 /* Not Implemented */
43--
441.9.1
45