From 2a30298bd1238fd94f5ee6ff7a7a20c1d75d576e Mon Sep 17 00:00:00 2001 From: Carlos Miguel Ferreira Date: Tue, 21 Feb 2017 17:33:43 +0000 Subject: [PATCH] boost: 1.63 Revision 2 - Fixed Regression This commit fixes an existent regression in boost 1.63 [1]. The regression appears when libc is used for the toolchain. [1] - https://svn.boost.org/trac/boost/ticket/11756 Signed-off-by: Carlos Miguel Ferreira --- libs/boost/Makefile | 2 +- ...ix_libc_regression_execution_monitor.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 libs/boost/patches/02_fix_libc_regression_execution_monitor.patch diff --git a/libs/boost/Makefile b/libs/boost/Makefile index 45e9c6282b..54c281ddd3 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/target.mk PKG_NAME:=boost PKG_VERSION:=1.63.0 PKG_SOURCE_VERSION:=1_63_0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION) diff --git a/libs/boost/patches/02_fix_libc_regression_execution_monitor.patch b/libs/boost/patches/02_fix_libc_regression_execution_monitor.patch new file mode 100644 index 0000000000..2c7533c286 --- /dev/null +++ b/libs/boost/patches/02_fix_libc_regression_execution_monitor.patch @@ -0,0 +1,22 @@ +Index: boost_1_63_0/boost/test/impl/execution_monitor.ipp +=================================================================== +--- boost_1_63_0.orig/boost/test/impl/execution_monitor.ipp ++++ boost_1_63_0/boost/test/impl/execution_monitor.ipp +@@ -1375,7 +1375,7 @@ enable( unsigned mask ) + #endif + + return ~old_cw & BOOST_FPE_ALL; +-#elif defined(__GLIBC__) && defined(__USE_GNU) ++#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) + if (BOOST_FPE_ALL == BOOST_FPE_OFF) + /* Not Implemented */ + return BOOST_FPE_OFF; +@@ -1415,7 +1415,7 @@ disable( unsigned mask ) + #endif + + return ~old_cw & BOOST_FPE_ALL; +-#elif defined(__GLIBC__) && defined(__USE_GNU) ++#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) + if (BOOST_FPE_ALL == BOOST_FPE_OFF) + /* Not Implemented */ + return BOOST_FPE_INV; -- 2.30.2