[Lsb-messages] /var/www/bzr/lsb/4.1/packaging r551: Backport fixes for building libstdcpp-test on newer distros.
Jeff Licquia
licquia at linuxfoundation.org
Wed Apr 24 01:10:03 UTC 2013
------------------------------------------------------------
revno: 551
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: packaging
timestamp: Tue 2013-04-23 21:10:03 -0400
message:
Backport fixes for building libstdcpp-test on newer distros.
added:
lsbdev-c++/gcc-thisify.patch
lsbdev-c++/no-underflow.patch
modified:
lsbdev-c++/Makefile
lsbdev-c++/lsb-build-c++.spec.sed
-------------- next part --------------
=== modified file 'lsbdev-c++/Makefile'
--- a/lsbdev-c++/Makefile 2011-02-01 18:01:31 +0000
+++ b/lsbdev-c++/Makefile 2013-04-24 01:10:03 +0000
@@ -9,7 +9,7 @@
# Release number of package relative to specification version
# Should have leading "."
-SUB_VERSION=.1
+SUB_VERSION=.2
# 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
=== 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-24 01:10:03 +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-03-26 15:08:40 +0000
+++ b/lsbdev-c++/lsb-build-c++.spec.sed 2013-04-24 01:10:03 +0000
@@ -19,6 +19,8 @@
Patch3: gcc-bits.patch
Patch4: gcc-gets.patch
Patch5: gcc-denorm.patch
+Patch6: gcc-thisify.patch
+Patch7: no-underflow.patch
BuildRoot: /var/tmp/lsb-build-c++-root
AutoReqProv: no
# Does not strictly require lsb
@@ -42,6 +44,8 @@
%patch3
%patch4
%patch5
+%patch6
+%patch7
%build
(cd gcc-%gccver/libstdc++-v3 ; \
=== added file 'lsbdev-c++/no-underflow.patch'
--- a/lsbdev-c++/no-underflow.patch 1970-01-01 00:00:00 +0000
+++ b/lsbdev-c++/no-underflow.patch 2013-04-24 01:10:03 +0000
@@ -0,0 +1,28 @@
+diff -ru gcc-4.1.0-orig/libstdc++-v3/include/ext/stdio_sync_filebuf.h gcc-4.1.0/libstdc++-v3/include/ext/stdio_sync_filebuf.h
+--- gcc-4.1.0-orig/libstdc++-v3/include/ext/stdio_sync_filebuf.h 2005-08-16 21:28:44.000000000 -0500
++++ gcc-4.1.0/libstdc++-v3/include/ext/stdio_sync_filebuf.h 2013-04-23 19:11:38.429177508 -0400
+@@ -92,13 +92,16 @@
+ int_type
+ syncputc(int_type __c);
+
++ /* Disabled for LSB headers; implementation detail.
+ virtual int_type
+ underflow()
+ {
+ int_type __c = this->syncgetc();
+ return this->syncungetc(__c);
+ }
++ */
+
++ /* Disabled for LSB headers; implementation detail.
+ virtual int_type
+ uflow()
+ {
+@@ -106,6 +109,7 @@
+ _M_unget_buf = this->syncgetc();
+ return _M_unget_buf;
+ }
++ */
+
+ virtual int_type
+ pbackfail(int_type __c = traits_type::eof())
More information about the lsb-messages
mailing list