aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
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:23:16 +0000
commit17d77db5e1203e18cdd178e7d9a457310425ebdc (patch)
tree85cf492ed707b8cdea92dcc3c7ac9cdc2ee7e865 /meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
parentbe6070e54f8fe3b530dce66623287403a50ac8a1 (diff)
downloadopenembedded-core-contrib-17d77db5e1203e18cdd178e7d9a457310425ebdc.tar.gz
openembedded-core-contrib-17d77db5e1203e18cdd178e7d9a457310425ebdc.tar.bz2
openembedded-core-contrib-17d77db5e1203e18cdd178e7d9a457310425ebdc.zip
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 Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch')
-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 @@
+From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Mon, 14 Sep 2015 15:05:24 +0100
+Subject: [PATCH] Do not qualify <fenv.h> names that might be macros.
+
+The patch was imported from the boost-test git repository
+(https://github.com/boostorg/test) as of commit id
+f50e7bc9fed323c5705c0ed992c03e80eeec1dd6.
+
+Upstream-Status: Accepted [commit f50e7bc9fed in develop branch]
+
+Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+---
+ include/boost/test/impl/execution_monitor.ipp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp
+index b3e873e..a7bdce2 100644
+--- a/include/boost/test/impl/execution_monitor.ipp
++++ b/include/boost/test/impl/execution_monitor.ipp
+@@ -1380,8 +1380,8 @@ enable( unsigned mask )
+
+ return ~old_cw & BOOST_FPE_ALL;
+ #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
+- ::feclearexcept(BOOST_FPE_ALL);
+- int res = ::feenableexcept( mask );
++ feclearexcept(BOOST_FPE_ALL);
++ int res = feenableexcept( mask );
+ return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
+ #else
+ /* Not Implemented */
+@@ -1417,8 +1417,8 @@ disable( unsigned mask )
+
+ return ~old_cw & BOOST_FPE_ALL;
+ #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
+- ::feclearexcept(BOOST_FPE_ALL);
+- int res = ::fedisableexcept( mask );
++ feclearexcept(BOOST_FPE_ALL);
++ int res = fedisableexcept( mask );
+ return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
+ #else
+ /* Not Implemented */
+--
+1.9.1
+