From 7a3ddc5eb8d3611e12b1727e6e40036f4cc7d28a Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Tue, 3 Jan 2012 18:20:40 +0100
Subject: [PATCH] Add an upstream patch for BOOST_ENABLE_THREADS

---
 boost-1.48.0-gcc47-pthreads.patch | 14 ++++++++++++++
 boost.spec                        |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 boost-1.48.0-gcc47-pthreads.patch

diff --git a/boost-1.48.0-gcc47-pthreads.patch b/boost-1.48.0-gcc47-pthreads.patch
new file mode 100644
index 0000000..016cfbd
--- /dev/null
+++ b/boost-1.48.0-gcc47-pthreads.patch
@@ -0,0 +1,14 @@
+Index: boost/config/stdlib/libstdcpp3.hpp
+===================================================================
+--- boost/config/stdlib/libstdcpp3.hpp  (revision 75635)
++++ boost/config/stdlib/libstdcpp3.hpp  (working copy)
+@@ -33,7 +33,8 @@
+ 
+ #ifdef __GLIBCXX__ // gcc 3.4 and greater:
+ #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+-        || defined(_GLIBCXX__PTHREADS)
++        || defined(_GLIBCXX__PTHREADS) \
++        || defined(_GLIBCXX_HAS_GTHREADS)
+       //
+       // If the std lib has thread support turned on, then turn it on in Boost
+       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
diff --git a/boost.spec b/boost.spec
index 6bf08b2..ab73327 100644
--- a/boost.spec
+++ b/boost.spec
@@ -28,7 +28,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.48.0
 %define version_enc 1_48_0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Boost and MIT and Python
 
 # The CMake build framework (set of CMakeLists.txt and module.cmake files) is
@@ -110,6 +110,9 @@ Patch6: boost-1.48.0-lexical_cast-incomplete.patch
 # https://svn.boost.org/trac/boost/ticket/6131
 Patch7: boost-1.48.0-foreach.patch
 
+# https://svn.boost.org/trac/boost/ticket/6165
+Patch8: boost-1.48.0-gcc47-pthreads.patch
+
 %bcond_with tests
 %bcond_with docs_generated
 
@@ -467,6 +470,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH1} | %{__patch} -p0 --fuzz=0
 %patch5 -p1
 %patch6 -p1
 %patch7 -p2
+%patch8 -p0
 
 %build
 # Support for building tests.
@@ -960,6 +964,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bjam.1*
 
 %changelog
+* Tue Jan  3 2012 Petr Machata <pmachata@redhat.com> - 1.48.0-3
+- Add an upstream patch for BOOST_ENABLE_THREADS
+
 * Tue Nov 29 2011 Petr Machata <pmachata@redhat.com> - 1.48.0-2
 - Add an upstream patch for BOOST_FOREACH declaration issue #756005
 - Add a proposed patch for error in boost lexical_cast #757385