[pkg-boost-commits] r14449 - boost/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2009-06-19 02:08:01 +0000 (Fri, 19 Jun 2009)
New Revision: 14449

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Fix for mpicc.openmpi segfault under fakeroot.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2009-06-07 18:29:20 UTC (rev 14448)
+++ boost/trunk/debian/changelog	2009-06-19 02:08:01 UTC (rev 14449)
@@ -12,11 +12,16 @@
   * patches/boost-python-examples.patch: New.  Patch example Jamroot to
     use installed libboost_python (thanks, Georg Schmid).  
     Closes: #452410.
+  
+  * rules: Set OMPI_MCA_disable_memory_allocator=1 to work around bad
+    interaction between fakeroot and OpenMPI.  Closes: #531415.
+  * control: Build-conflict with libopenmpi-dev version in unstable that
+    contains this bug.
 
   * libboost-doc.README.Debian: Explain how to build Boost.Python
     examples.
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 07 Jun 2009 13:28:30 -0500
+ -- Steve M. Robbins <smr at debian.org>  Thu, 18 Jun 2009 21:03:30 -0500
 
 boost1.38 (1.38.0-6) unstable; urgency=low
 

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2009-06-07 18:29:20 UTC (rev 14448)
+++ boost/trunk/debian/control	2009-06-19 02:08:01 UTC (rev 14449)
@@ -5,7 +5,7 @@
 Maintainer: Debian Boost Team <pkg-boost-devel at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>, Christophe Prud'homme <prudhomm at debian.org>
 Build-Depends: debhelper (>= 7), quilt, bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6), mpi-default-dev
-Build-Conflicts: boost-build
+Build-Conflicts: boost-build, libopenmpi-dev (= 1.3.2-2)
 XS-Python-Version: 2.4, 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-boost/boost/trunk

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2009-06-07 18:29:20 UTC (rev 14448)
+++ boost/trunk/debian/rules	2009-06-19 02:08:01 UTC (rev 14449)
@@ -1,11 +1,12 @@
 #! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
 
 export DH_OPTIONS
 
-include /usr/share/quilt/quilt.make
+# Fix for mpicc.openmpi segfaulting under fakeroot; see #531415
+# This can be removed when fakeroot does this itself.
+export OMPI_MCA_disable_memory_allocator=1
 
 # set the number of build jobs
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))