[pkg-boost-commits] r14699 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2012-01-05 05:52:33 +0000 (Thu, 05 Jan 2012)
New Revision: 14699

Added:
   boost/trunk/debian/patches/gcc-4.7-threading-detection.patch
   boost/trunk/debian/patches/mpi-allocator-c++0x.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Merge changes from 1.46.1-8.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2012-01-04 06:45:26 UTC (rev 14698)
+++ boost/trunk/debian/changelog	2012-01-05 05:52:33 UTC (rev 14699)
@@ -3,12 +3,19 @@
   * patches/fusion-push-front-broken.patch: New.  Upstream patch that
     fixes #include <boost/fusion/algorithm/transformation/push_front.hpp>.
     Closes: #653812.
-  
+
   * patches/math-define-l.patch: New.  Rename class template parameter
     "L".  Closes: #653764.
 
- -- Steve M. Robbins <smr at debian.org>  Tue, 03 Jan 2012 00:25:20 -0600
+  * patches/gcc-4.7-threading-detection.patch: New, from upstream.  Enable
+    gcc 4.7 threading detection.  Closes: #654425.
 
+  * patches/mpi-allocator-c++0x.patch: New.  Workaround to enable using
+    Boost.MPI with -std=c++0x mode on gcc 4.6.  Fix will be in gcc 4.6.3
+    and 4.7.  Closes: #639862.
+
+ -- Steve M. Robbins <smr at debian.org>  Wed, 04 Jan 2012 23:50:52 -0600
+
 boost1.48 (1.48.0-2) unstable; urgency=low
 
   * patches/foreach.patch: New.  Upstream patch to fix BOOST_FOREACH build

Copied: boost/trunk/debian/patches/gcc-4.7-threading-detection.patch (from rev 14698, boost/branches/1.46.1/debian/patches/gcc-4.7-threading-detection.patch)
===================================================================
--- boost/trunk/debian/patches/gcc-4.7-threading-detection.patch	                        (rev 0)
+++ boost/trunk/debian/patches/gcc-4.7-threading-detection.patch	2012-01-05 05:52:33 UTC (rev 14699)
@@ -0,0 +1,16 @@
+Description: Enable gcc 4.7 threading detection 
+ Patch taken from upstream change set 76133.
+Author: Ai Azuma
+Bug: 654425
+Forwarded: https://svn.boost.org/trac/boost/ticket/6165
+
+--- a/boost/config/stdlib/libstdcpp3.hpp
++++ b/boost/config/stdlib/libstdcpp3.hpp
+@@ -34,5 +34,6 @@
+ #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

Copied: boost/trunk/debian/patches/mpi-allocator-c++0x.patch (from rev 14698, boost/branches/1.46.1/debian/patches/mpi-allocator-c++0x.patch)
===================================================================
--- boost/trunk/debian/patches/mpi-allocator-c++0x.patch	                        (rev 0)
+++ boost/trunk/debian/patches/mpi-allocator-c++0x.patch	2012-01-05 05:52:33 UTC (rev 14699)
@@ -0,0 +1,24 @@
+Description: Fix include of <boost/mpi.hpp> on gcc < 4.6.3
+ Workaround proposed in boost Trac ticket to allow using
+ -std=c++0x with gcc 4.6.  It turns out to be a gcc
+ bug that is fixed for gcc 4.6.3 and 4.7.
+Author: Petar Marendic
+Bug: 639862
+Forwarded: https://svn.boost.org/trac/boost/ticket/5538
+
+
+--- boost1.46-1.46.1.orig/boost/mpi/allocator.hpp
++++ boost1.46-1.46.1/boost/mpi/allocator.hpp
+@@ -170,6 +170,12 @@
+     new ((void *)p) T(val);
+   }
+ 
++  /* Default construct a value of type T at the location referenced by p. */
++  void construct(pointer p) 
++  {
++      new ((void *)p) T();
++  }
++
+   /** Destroy the object referenced by @c p. */
+   void destroy(pointer p)
+   {

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2012-01-04 06:45:26 UTC (rev 14698)
+++ boost/trunk/debian/patches/series	2012-01-05 05:52:33 UTC (rev 14699)
@@ -7,3 +7,5 @@
 pythonid.patch
 fusion-push-front-broken.patch
 math-define-l.patch
+gcc-4.7-threading-detection.patch
+mpi-allocator-c++0x.patch