summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-06-03 12:14:44 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-04 14:13:33 +0100
commitf6f7db7c2ab409abab0e7a2f9d36a35419e76076 (patch)
tree970cf2a7171966aeddaa9af5d563090bcdac6e2e
parent7a0ef75f3e0455174a94b8b1a5b61f41cd2b92ba (diff)
downloadpoky-f6f7db7c2ab409abab0e7a2f9d36a35419e76076.tar.gz
boost: update to 1.61.0
0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch has been merged upstream. (From OE-Core rev: 25d4129bab9f6abeecbfec6b69612e387851bfe3) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/bjam-native_1.61.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.60.0.bb)0
-rw-r--r--meta/recipes-support/boost/boost-1.61.0.inc (renamed from meta/recipes-support/boost/boost-1.60.0.inc)4
-rw-r--r--meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch45
-rw-r--r--meta/recipes-support/boost/boost_1.61.0.bb (renamed from meta/recipes-support/boost/boost_1.60.0.bb)1
4 files changed, 2 insertions, 48 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.60.0.bb b/meta/recipes-support/boost/bjam-native_1.61.0.bb
index 32646d707b..32646d707b 100644
--- a/meta/recipes-support/boost/bjam-native_1.60.0.bb
+++ b/meta/recipes-support/boost/bjam-native_1.61.0.bb
diff --git a/meta/recipes-support/boost/boost-1.60.0.inc b/meta/recipes-support/boost/boost-1.61.0.inc
index a38693e25d..4553677b26 100644
--- a/meta/recipes-support/boost/boost-1.60.0.inc
+++ b/meta/recipes-support/boost/boost-1.61.0.inc
@@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" 14SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
15 15
16SRC_URI[md5sum] = "65a840e1a0b13a558ff19eeb2c4f0cbe" 16SRC_URI[md5sum] = "6095876341956f65f9d35939ccea1a9f"
17SRC_URI[sha256sum] = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b" 17SRC_URI[sha256sum] = "a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640"
18 18
19S = "${WORKDIR}/${BOOST_P}" 19S = "${WORKDIR}/${BOOST_P}"
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
deleted file mode 100644
index df7e71fea6..0000000000
--- a/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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
diff --git a/meta/recipes-support/boost/boost_1.60.0.bb b/meta/recipes-support/boost/boost_1.61.0.bb
index 4d824c85b5..d8b14fed7b 100644
--- a/meta/recipes-support/boost/boost_1.60.0.bb
+++ b/meta/recipes-support/boost/boost_1.61.0.bb
@@ -3,6 +3,5 @@ include boost.inc
3 3
4SRC_URI += "\ 4SRC_URI += "\
5 file://arm-intrinsics.patch \ 5 file://arm-intrinsics.patch \
6 file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \
7 file://consider-hardfp.patch \ 6 file://consider-hardfp.patch \
8" 7"