diff --git a/meta/recipes-support/boost/bjam-native_1.60.0.bb b/meta/recipes-support/boost/bjam-native_1.61.0.bb similarity index 100% rename from meta/recipes-support/boost/bjam-native_1.60.0.bb rename to 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 similarity index 83% rename from meta/recipes-support/boost/boost-1.60.0.inc rename to 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}" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "65a840e1a0b13a558ff19eeb2c4f0cbe" -SRC_URI[sha256sum] = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b" +SRC_URI[md5sum] = "6095876341956f65f9d35939ccea1a9f" +SRC_URI[sha256sum] = "a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640" S = "${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 @@ -From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Mon, 14 Sep 2015 15:05:24 +0100 -Subject: [PATCH] Do not qualify 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 ---- - 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 - diff --git a/meta/recipes-support/boost/boost_1.60.0.bb b/meta/recipes-support/boost/boost_1.61.0.bb similarity index 59% rename from meta/recipes-support/boost/boost_1.60.0.bb rename to 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 SRC_URI += "\ file://arm-intrinsics.patch \ - file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \ file://consider-hardfp.patch \ "