[Lsb-messages] /var/www/bzr/lsb/devel/packaging r564: Fix libstdcpp-test build problem with explicit this reference.

[Jeff Licquia]

------------------------------------------------------------
revno: 564
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: packaging
timestamp: Tue 2013-04-23 16:39:53 -0400
message:
  Fix libstdcpp-test build problem with explicit this reference.
added:
  lsbdev-c++/gcc-thisify.patch
modified:
  lsbdev-c++/Makefile
  lsbdev-c++/lsb-build-c++.spec.sed
-------------- next part --------------
=== modified file 'lsbdev-c++/Makefile'
--- a/lsbdev-c++/Makefile	2012-09-25 16:10:35 +0000
+++ b/lsbdev-c++/Makefile	2013-04-23 20:39:53 +0000
@@ -9,11 +9,11 @@
 
 # Release number of package relative to specification version
 # Should have leading "."
-SUB_VERSION=.2
+SUB_VERSION=.3
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=1
 
 include ../Makefile.common
 

=== added file 'lsbdev-c++/gcc-thisify.patch'
--- a/lsbdev-c++/gcc-thisify.patch	1970-01-01 00:00:00 +0000
+++ b/lsbdev-c++/gcc-thisify.patch	2013-04-23 20:39:53 +0000
@@ -0,0 +1,12 @@
+diff -ru gcc-4.1.0-orig/libstdc++-v3/include/ext/pb_assoc/detail/rb_tree_map_/erase_fn_imps.hpp gcc-4.1.0/libstdc++-v3/include/ext/pb_assoc/detail/rb_tree_map_/erase_fn_imps.hpp
+--- gcc-4.1.0-orig/libstdc++-v3/include/ext/pb_assoc/detail/rb_tree_map_/erase_fn_imps.hpp	2005-08-16 21:28:44.000000000 -0500
++++ gcc-4.1.0/libstdc++-v3/include/ext/pb_assoc/detail/rb_tree_map_/erase_fn_imps.hpp	2013-04-23 16:30:24.851458774 -0400
+@@ -47,7 +47,7 @@
+ PB_ASSOC_CLASS_C_DEC::
+ erase(const_key_reference r_key)
+ {
+-  iterator it = find(r_key);
++  iterator it = this->find(r_key);
+ 
+   if (it == PB_ASSOC_BASE_C_DEC::find_end())
+     return (0);

=== modified file 'lsbdev-c++/lsb-build-c++.spec.sed'
--- a/lsbdev-c++/lsb-build-c++.spec.sed	2012-09-25 16:10:35 +0000
+++ b/lsbdev-c++/lsb-build-c++.spec.sed	2013-04-23 20:39:53 +0000
@@ -19,6 +19,7 @@
 Patch3: gcc-bits.patch
 Patch4: gcc-gets.patch
 Patch5: gcc-denorm.patch
+Patch6: gcc-thisify.patch
 BuildRoot: /var/tmp/lsb-build-c++-root
 AutoReqProv: no
 # Does not strictly require lsb
@@ -42,6 +43,7 @@
 %patch3
 %patch4
 %patch5
+%patch6
 
 %build
 (cd gcc-%gccver/libstdc++-v3 ; \