From d8ec5cd0e86ea40fe16aedcf8de2b738e47ec44f Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 14 Sep 2015 18:35:30 +0100
Subject: [PATCH] Patch Boost.Test to fix #1262444

---
 boost-1.59-test-fenv.patch | 32 ++++++++++++++++++++++++++++++++
 boost.spec                 |  9 ++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 boost-1.59-test-fenv.patch

diff --git a/boost-1.59-test-fenv.patch b/boost-1.59-test-fenv.patch
new file mode 100644
index 0000000..df87f56
--- /dev/null
+++ b/boost-1.59-test-fenv.patch
@@ -0,0 +1,32 @@
+commit 2f3b98e640c25fe45ae691a5aa950745380b983e
+Author: Jonathan Wakely <jwakely@redhat.com>
+Date:   Mon Sep 14 15:05:24 2015 +0100
+
+    Do not qualify <fenv.h> names that might be macros.
+
+diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp
+index 3a9e779..8b319df 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 */
diff --git a/boost.spec b/boost.spec
index acc9312..9a2f227 100644
--- a/boost.spec
+++ b/boost.spec
@@ -32,7 +32,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.59.0
 %define version_enc 1_59_0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Boost and MIT and Python
 
 %define toplev_dirname %{name}_%{version_enc}
@@ -127,6 +127,9 @@ Patch70: boost-1.59.0-log.patch
 # https://github.com/boostorg/python/pull/40
 Patch80: boost-1.59-python-make_setter.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1262444
+Patch81: boost-1.59-test-fenv.patch
+
 %bcond_with tests
 %bcond_with docs_generated
 
@@ -622,6 +625,7 @@ a number of significant features and is now developed independently
 %patch68 -p1
 %patch70 -p2
 %patch80 -p2
+%patch81 -p2
 
 # At least python2_version needs to be a macro so that it's visible in
 # %%install as well.
@@ -1283,6 +1287,9 @@ fi
 %{_mandir}/man1/bjam.1*
 
 %changelog
+* Mon Sep 14 2015 Jonathan Wakely <jwakely@redhat.com> 1.59.0-4
+- Patch Boost.Test to fix #1262444
+
 * Wed Sep 02 2015 Jonathan Wakely <jwakely@redhat.com> - 1.59.0-3
 - Rebuilt for Boost 1.59