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

[Steven Michael Robbins]

Author: smr
Date: 2009-10-04 04:49:37 +0000 (Sun, 04 Oct 2009)
New Revision: 14507

Added:
   boost/trunk/debian/patches/boost-test-invalid-read.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
   boost/trunk/debian/rules
Log:
Merge from 1.39.0-5: fixes for parallel build, -mt symlinks, and Boost.Test invalid read error.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2009-10-04 03:52:36 UTC (rev 14506)
+++ boost/trunk/debian/changelog	2009-10-04 04:49:37 UTC (rev 14507)
@@ -4,6 +4,16 @@
   * control: New package libboost-graph-parallel (thanks, Mathieu
     Malaterre).  Closes: #549203.
 
+  * [Merge from 1.39.0-5] rules: Rule $(bjam) needs to depend on
+    $(QUILT_STAMPFN) because patches/bootstrap.patch modifies script
+    bootstrap.sh, used to build $(bjam).  Thanks to Andreas Ferber for the
+    report and astute analysis.  Closes: #545535.  Put the "-mt"
+    decoration before the final suffix for compatibility symlinks.
+    Closes: #545773.
+
+  * [Merge from 1.39.0-5] patches/boost-test-invalid-read.patch: New.  Fix
+    invalid read error detected by valgrind.  Closes: #538946.
+
  -- Steve M. Robbins <smr at debian.org>  Sat, 03 Oct 2009 22:51:20 -0500
 
 boost1.40 (1.40.0-1) unstable; urgency=low

Copied: boost/trunk/debian/patches/boost-test-invalid-read.patch (from rev 14503, boost/branches/1.39.0/debian/patches/boost-test-invalid-read.patch)
===================================================================
--- boost/trunk/debian/patches/boost-test-invalid-read.patch	                        (rev 0)
+++ boost/trunk/debian/patches/boost-test-invalid-read.patch	2009-10-04 04:49:37 UTC (rev 14507)
@@ -0,0 +1,33 @@
+Fix for #538946
+Reported upstream as https://svn.boost.org/trac/boost/ticket/2647
+Patch taken from http://www.nabble.com/-Boost.Test--valgrind-complains-about-invalid-reads-td20500154.html
+
+
+--- boost1.39-1.39.0.orig/boost/test/impl/framework.ipp
++++ boost1.39-1.39.0/boost/test/impl/framework.ipp
+@@ -125,12 +125,8 @@
+     {
+         while( !m_test_units.empty() ) {
+             test_unit_store::value_type const& tu = *m_test_units.begin();
+-
+             // the delete will erase this element from map
+-            if( test_id_2_unit_type( tu.second->p_id ) == tut_suite )
+-                delete  (test_suite const*)tu.second;
+-            else
+-                delete  (test_case const*)tu.second;
++	    delete tu.second;
+         }
+     }
+ 
+--- boost1.39-1.39.0.orig/boost/test/unit_test_suite_impl.hpp
++++ boost1.39-1.39.0/boost/test/unit_test_suite_impl.hpp
+@@ -71,8 +71,7 @@
+ 
+     void                                increase_exp_fail( unsigned num );
+ 
+-protected:
+-    ~test_unit();
++    virtual ~test_unit();
+ 
+ private:
+     // Data members

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2009-10-04 03:52:36 UTC (rev 14506)
+++ boost/trunk/debian/patches/series	2009-10-04 04:49:37 UTC (rev 14507)
@@ -1,3 +1,4 @@
+boost-test-invalid-read.patch
 mips-asm.patch
 boost-python-examples.patch
 endian.patch

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2009-10-04 03:52:36 UTC (rev 14506)
+++ boost/trunk/debian/rules	2009-10-04 04:49:37 UTC (rev 14507)
@@ -70,7 +70,7 @@
 mk_ln_files = $(shell echo $(call mk_base_name,$(2),$(3),$(4)).so.$(SOVERSION) $(call mk_base_name,$(2),$(3),$(4)).so >> $(call mk_deb_dev,$(1),$(3)).links)
 
 # Make compatibility symlinks libfoo-mt --> libfoo
-mk_mtln_files = $(shell echo $(call mk_base_name,$(2),$(3),$(4)).so.$(SOVERSION) $(call mk_base_name,$(2),$(3),$(4))-mt.so >> $(call mk_deb_dev,$(1),$(3)).links)
+mk_mtln_files = $(shell echo $(call mk_base_name,$(2),$(3),$(4)).so.$(SOVERSION) $(call mk_base_name,$(2),$(3)-mt,$(4)).so >> $(call mk_deb_dev,$(1),$(3)).links)
 
 # Function that updates debhelper files for a given library variant
 # Input: component, library, variant, suffix
@@ -150,7 +150,7 @@
 # FIXME: find a flag to disable reading /etc/site-config.jam
 JAM = $(bjam) $(JOBS) -d2 $(JAM_OPT) --layout=system --user-config=$(CURDIR)/user-config.jam debug-symbols=on
 
-$(bjam):
+$(bjam): $(QUILT_STAMPFN)
 	./bootstrap.sh --with-icu --prefix=$(CURDIR)/debian/tmp/usr
 
 user-config.jam: