Browse Source

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 <carlosmf.pt@gmail.com>
lilik-openwrt-22.03
Carlos Miguel Ferreira 8 years ago
parent
commit
2a30298bd1
No known key found for this signature in database GPG Key ID: 33A82DFF65092E55
2 changed files with 23 additions and 1 deletions
  1. +1
    -1
      libs/boost/Makefile
  2. +22
    -0
      libs/boost/patches/02_fix_libc_regression_execution_monitor.patch

+ 1
- 1
libs/boost/Makefile View File

@ -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)


+ 22
- 0
libs/boost/patches/02_fix_libc_regression_execution_monitor.patch View File

@ -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;

Loading…
Cancel
Save