[pkg-boost-commits] r14546 - in boost/branches/1.40.0/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2009-12-21 04:23:37 +0000 (Mon, 21 Dec 2009)
New Revision: 14546

Added:
   boost/branches/1.40.0/debian/patches/gcc-4.patch
Modified:
   boost/branches/1.40.0/debian/changelog
   boost/branches/1.40.0/debian/patches/series
Log:
Add upstream patch for building with gcc 4.4.

Modified: boost/branches/1.40.0/debian/changelog
===================================================================
--- boost/branches/1.40.0/debian/changelog	2009-12-21 03:30:46 UTC (rev 14545)
+++ boost/branches/1.40.0/debian/changelog	2009-12-21 04:23:37 UTC (rev 14546)
@@ -1,11 +1,3 @@
-boost1.40 (1.40.0-6) unstable; urgency=low
-
-  * source/format:
-  * control:
-  * rules: Switch to source format "3.0 (quilt)".
-
- -- Steve M. Robbins <smr at debian.org>  Fri, 18 Dec 2009 00:15:40 -0600
-
 boost1.40 (1.40.0-5) unstable; urgency=low
 
   * control:
@@ -14,8 +6,17 @@
     supported python versions using "pyversions".  Thanks to Jakub Wilk
     for the patch.  Closes: #556924.
 
- -- Steve M. Robbins <smr at debian.org>  Tue, 15 Dec 2009 00:00:21 -0600
+  * source/format:
+  * control:
+  * rules: Switch to source format "3.0 (quilt)".
+  
+  * patches/gcc-4.patch: New (thanks, Jakub Wilk).  Patch from upstream
+    that works around gcc 4 bug by replacing BOOST_MPL_ASSERT by
+    BOOST_STATIC_ASSERT in mpi_datatype_oarchive.h.  Closes: #550300,
+    #561407.
 
+ -- Steve M. Robbins <smr at debian.org>  Sun, 20 Dec 2009 22:21:54 -0600
+
 boost1.40 (1.40.0-4) unstable; urgency=low
 
   * rtupdate: Don't die if link target doesn't exist.  Update of

Added: boost/branches/1.40.0/debian/patches/gcc-4.patch
===================================================================
--- boost/branches/1.40.0/debian/patches/gcc-4.patch	                        (rev 0)
+++ boost/branches/1.40.0/debian/patches/gcc-4.patch	2009-12-21 04:23:37 UTC (rev 14546)
@@ -0,0 +1,27 @@
+Description: Replace MPL_ASSERT by STATIC_ASSERT because of GCC 4.4 bug.
+Origin: https://svn.boost.org/trac/boost/changeset/56978/
+Bug: https://svn.boost.org/trac/boost/ticket/3371
+Bug-Debian: http://bugs.debian.org/550300
+Last-Update: 2009-12-19
+
+diff -r 172b8d680f5d -r 92877e472533 boost/mpi/detail/mpi_datatype_oarchive.hpp
+--- a/boost/mpi/detail/mpi_datatype_oarchive.hpp	Sat Oct 17 19:08:46 2009 +0000
++++ b/boost/mpi/detail/mpi_datatype_oarchive.hpp	Sun Oct 18 16:03:46 2009 +0000
+@@ -18,6 +18,7 @@
+ #include <boost/mpi/detail/mpi_datatype_primitive.hpp>
+ #include <boost/mpi/datatype_fwd.hpp>
+ #include <boost/mpl/assert.hpp>
++#include <boost/static_assert.hpp>
+ #include <boost/integer.hpp>
+ #include <boost/archive/detail/register_archive.hpp>
+ 
+@@ -61,7 +62,7 @@
+     {
+       // select the right sized integer for the enum
+       typedef typename boost::uint_t<8*sizeof(T)>::least int_type;
+-      BOOST_MPL_ASSERT((sizeof(T)==sizeof(int_type)));
++      BOOST_STATIC_ASSERT((sizeof(T)==sizeof(int_type)));
+       this->save(*reinterpret_cast<int_type const*>(&t));
+     }
+ 
+

Modified: boost/branches/1.40.0/debian/patches/series
===================================================================
--- boost/branches/1.40.0/debian/patches/series	2009-12-21 03:30:46 UTC (rev 14545)
+++ boost/branches/1.40.0/debian/patches/series	2009-12-21 04:23:37 UTC (rev 14546)
@@ -10,3 +10,4 @@
 boost-build-pythonid.patch
 hurd-ellint_rd.patch
 hurd-execution_monitor.patch
+gcc-4.patch