rpms/boost/devel boost-1_37_0-smp.patch, NONE, 1.1 boost-bitset.patch, NONE, 1.1 boost.spec, 1.57, 1.58

[Petr Machata]

Author: pmachata

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28811

Modified Files:
	boost.spec 
Added Files:
	boost-1_37_0-smp.patch boost-bitset.patch 
Log Message:
- Apply a SMP patch from Stefan Ring
- Apply a workaround for "cannot appear in a constant-expression" in
  dynamic_bitset library.
- Resolves: #491537


boost-1_37_0-smp.patch:

--- NEW FILE boost-1_37_0-smp.patch ---
diff -up boost_1_37_0/configure.smp boost_1_37_0/configure
--- boost_1_37_0/configure.smp	2009-02-05 18:49:01.000000000 +0100
+++ boost_1_37_0/configure	2009-02-05 18:53:55.000000000 +0100
@@ -347,7 +347,7 @@ LIBS=$LIBS
 
 all: .dummy
 	@echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage"
-	@\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage || \\
+	@\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) !!!SMP_FLAGS!!! stage || \\
 	echo "Not all Boost libraries built properly."
 
 clean: .dummy

boost-bitset.patch:

--- NEW FILE boost-bitset.patch ---
--- boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp.debug	2008-10-22 03:13:59.000000000 +0900
+++ boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp	2009-03-23 03:36:40.000000000 +0900
@@ -1017,8 +1017,11 @@
                           ? access_by_bytes
                           : access_by_blocks;
 
+    if (mode)
+       return do_count(m_bits.begin(), num_blocks(), Block(0),
+                                          static_cast<value_to_type<true> *>(0));
     return do_count(m_bits.begin(), num_blocks(), Block(0),
-                                       static_cast<value_to_type<mode> *>(0));
+                                       static_cast<value_to_type<false> *>(0));
 }
 
 


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- boost.spec	24 Feb 2009 05:32:14 -0000	1.57
+++ boost.spec	23 Mar 2009 13:44:39 -0000	1.58
@@ -4,7 +4,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.37.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -28,6 +28,8 @@
 Patch4: boost-gcc-soname.patch
 Patch5: boost-function_template.patch
 Patch6: boost-unneccessary_iostreams.patch
+Patch7: boost-1_37_0-smp.patch
+Patch8: boost-bitset.patch
 
 %description
 Boost provides free peer-reviewed portable C++ source libraries.  The
@@ -74,6 +76,9 @@
 sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0
 %patch5 -p0
 %patch6 -p0
+%patch7 -p1
+#sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0
+%patch8 -p1
 
 %build
 BOOST_ROOT=`pwd`
@@ -206,6 +211,12 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Mar 23 2009 Petr Machata <pmachata at redhat.com> - 1.37.0-5
+- Apply a SMP patch from Stefan Ring
+- Apply a workaround for "cannot appear in a constant-expression" in
+  dynamic_bitset library.
+- Resolves: #491537
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.37.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild