revert to 1.37

diff --git a/Makefile b/Makefile
index 51678ba..a89a170 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ SHA1SUM = sha1sum
 # default - overridden by the build
 SPECFILE = gnuradio.spec
 
-main.URL       := http://mirror.onelab.eu/third-party/boost_1_40_0.tar.bz2
-main.SHA1SUM    := 9dbaa06ce1d99ce310011c2eaf816ecb003b3096
+main.URL       := http://mirror.onelab.eu/third-party/boost_1_37_0.tar.bz2
+main.SHA1SUM    := c0d0cf9ad8d954507824aed51a3e93e6a9da1d99
 main.FILE      := $(notdir $(main.URL))
 
 # Thierry - when called from within the build, PWD is /build

diff --git a/boost-1_37_0-smp.patch b/boost-1_37_0-smp.patch
new file mode 100644 (file)
index 0000000..b753bea
--- /dev/null
+++ b/boost-1_37_0-smp.patch
@@ -0,0 +1,12 @@
+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

diff --git a/boost-bitset.patch b/boost-bitset.patch
new file mode 100644 (file)
index 0000000..1d354aa
--- /dev/null
+++ b/boost-bitset.patch
@@ -0,0 +1,15 @@
+--- 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));
+ }
+ 
+ 

diff --git a/boost-configure.patch b/boost-configure.patch
index 7ce1a52..91e8508 100644 (file)
--- a/boost-configure.patch
+++ b/boost-configure.patch
@@ -13,7 +13,7 @@
   
   BJAM=""
   TOOLSET=""
-! BJAM_CONFIG="-d2 --layout=system variant=release debug-symbols=on"
+! BJAM_CONFIG="-d2 --layout=system variant=release threading=single,multi debug-symbols=on"
   BUILD=""
   PREFIX=/usr/local
   EPREFIX=

diff --git a/boost-function_template.patch b/boost-function_template.patch
new file mode 100644 (file)
index 0000000..fa57836
--- /dev/null
+++ b/boost-function_template.patch
@@ -0,0 +1,14 @@
+--- boost/function/function_template.hpp.orig  2008-12-19 10:32:27.000000000 +0000
++++ boost/function/function_template.hpp       2008-12-19 10:33:27.000000000 +0000
+@@ -950,10 +950,10 @@
+           f.vtable->manager(f.functor, this->functor,
+                             boost::detail::function::move_functor_tag);
+                 f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)      
+         } else {
+           clear();
+         }
++#if !defined(BOOST_NO_EXCEPTIONS)      
+       } catch (...) {
+         vtable = 0;
+         throw;

diff --git a/boost-gcc-soname.patch b/boost-gcc-soname.patch
index f26b033..e8ab492 100644 (file)
--- a/boost-gcc-soname.patch
+++ b/boost-gcc-soname.patch
@@ -1,37 +1,21 @@
-*** tools/build/v2/tools/gcc.jam.orig  2007-05-03 08:09:04.000000000 +0200
---- tools/build/v2/tools/gcc.jam       2007-06-26 20:37:44.000000000 +0200
-*************** if [ os.name ] != NT && [ os.name ] != O
-*** 316,322 ****
-      # expected, therefore it has been disabled.
-  
-      HAVE_SONAME   = "" ;
-!     SONAME_OPTION = -h ;
-  }
-  
-  
---- 316,323 ----
-      # expected, therefore it has been disabled.
-  
-      HAVE_SONAME   = "" ;
-!     SONAME_OPTION = -soname ;
-!     SONAME_VERSION = 3 ;
-  }
-  
-  
-*************** rule link.dll ( targets * : sources * : 
-*** 631,637 ****
-  # Differ from 'link' above only by -shared.
-  actions link.dll bind LIBRARIES
-  {
-!     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
-  }
-  
-  # Set up threading support. It's somewhat contrived, so perform it at the end,
---- 632,638 ----
-  # Differ from 'link' above only by -shared.
-  actions link.dll bind LIBRARIES
-  {
-!     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
-  }
-  
-  # Set up threading support. It's somewhat contrived, so perform it at the end,
+--- boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam.orig       2008-08-11 13:15:13.000000000 +0200
++++ boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam    2008-08-11 15:21:05.000000000 +0200
+@@ -336,7 +336,8 @@
+     # OSF does have an option called -soname but it does not seem to work as
+     # expected, therefore it has been disabled.
+     HAVE_SONAME   = "" ;
+-    SONAME_OPTION = -h ;
++    SONAME_OPTION = -soname ;
++    SONAME_VERSION = !!!SONAME!!! ;
+ }
+ 
+ 
+@@ -726,7 +727,7 @@
+ # Differs from 'link' above only by -shared.
+ actions link.dll bind LIBRARIES
+ {
+-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
++    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+ }
+ 
+ rule setup-threading ( targets * : sources * : properties * )

diff --git a/boost-gcc43.patch b/boost-gcc43.patch
index af64bd0..7b1f999 100644 (file)
--- a/boost-gcc43.patch
+++ b/boost-gcc43.patch
@@ -1,19 +1,74 @@
-diff -urp boost_1_34_1/boost/spirit/phoenix/operators.hpp boost_1_34_1.pm/boost/spirit/phoenix/operators.hpp
---- boost_1_34_1/boost/spirit/phoenix/operators.hpp    2006-08-25 18:27:30.000000000 +0200
-+++ boost_1_34_1.pm/boost/spirit/phoenix/operators.hpp 2008-02-06 16:29:32.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <boost/spirit/phoenix/composite.hpp>
- #include <boost/config.hpp>
- #include <boost/mpl/if.hpp>
+diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp
+--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp     2008-08-11 23:49:44.000000000 +0200
++++ boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp  2008-08-11 23:50:38.000000000 +0200
+@@ -35,6 +35,8 @@ namespace std{
+ #include <boost/serialization/nvp.hpp>
+ #include <boost/archive/detail/register_archive.hpp>
+ 
++#include <limits.h>
++
+ // determine if its necessary to handle (u)int64_t specifically
+ // i.e. that its not a synonym for (unsigned) long
+ // if there is no 64 bit int or if its the same as a long
+Only in boost_1_36_0_beta1/boost/archive: polymorphic_iarchive.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp
+--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp     2008-08-11 23:49:44.000000000 +0200
++++ boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp  2008-08-11 23:50:38.000000000 +0200
+@@ -34,6 +34,8 @@ namespace std{
+ #include <boost/serialization/nvp.hpp>
+ #include <boost/archive/detail/register_archive.hpp>
+ 
 +#include <limits.h>
++
+ // determine if its necessary to handle (u)int64_t specifically
+ // i.e. that its not a synonym for (unsigned) long
+ // if there is no 64 bit int or if its the same as a long
+Only in boost_1_36_0_beta1/boost/archive: polymorphic_oarchive.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp
+--- boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp     2008-08-11 23:49:45.000000000 +0200
++++ boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp  2008-08-11 23:50:38.000000000 +0200
+@@ -158,7 +158,7 @@ namespace boost {
+       typedef typename time_zone_type::base_type time_zone_base_type;
+       typedef typename time_zone_type::time_duration_type time_duration_type;
+       typedef time_zone_names_base<char_type> time_zone_names;
+-      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
++      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets_t;
+       typedef std::basic_string<char_type> string_type;
+ 
+       //! Constructs an empty database
+@@ -346,18 +346,18 @@ namespace boost {
+         time_duration_type utc_offset = 
+           str_from_delimited_time_duration<time_duration_type,char_type>(result[GMTOFFSET]);
+         
+-        dst_adjustment_offsets adjust(time_duration_type(0,0,0),
+-                                      time_duration_type(0,0,0),
+-                                      time_duration_type(0,0,0));
++        dst_adjustment_offsets_t adjust(time_duration_type(0,0,0),
++                                      time_duration_type(0,0,0),
++                                      time_duration_type(0,0,0));
+ 
+         boost::shared_ptr<rule_type> rules;
  
- ///////////////////////////////////////////////////////////////////////////////
- namespace phoenix {
-diff -urp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex_creator.hpp
---- boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp        2006-07-16 18:06:38.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/basic_regex_creator.hpp     2008-02-06 17:36:42.000000000 +0100
-@@ -24,6 +24,8 @@
- #  include BOOST_ABI_PREFIX
+         if(has_dst){
+-          adjust = dst_adjustment_offsets(
+-                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
+-                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
+-                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
+-                                          );
++          adjust = dst_adjustment_offsets_t(
++                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
++                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
++                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
++                                          );
+ 
+           rules = 
+             boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
+Only in boost_1_36_0_beta1/boost/date_time: tz_db_base.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp     2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp  2008-08-11 23:50:38.000000000 +0200
+@@ -36,6 +36,8 @@
+ #  pragma warning(disable: 4800)
  #endif
  
 +#include <limits.h>
@@ -21,11 +76,12 @@ diff -urp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1.pm/bo
  namespace boost{
  
  namespace re_detail{
-diff -urp boost_1_34_1/boost/regex/v4/basic_regex.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex.hpp
---- boost_1_34_1/boost/regex/v4/basic_regex.hpp        2007-06-05 19:28:18.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/basic_regex.hpp     2008-02-06 17:33:30.000000000 +0100
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
+Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_creator.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp     2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp  2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ #pragma warning(pop)
  #endif
  
 +#include <limits.h>
@@ -33,11 +89,12 @@ diff -urp boost_1_34_1/boost/regex/v4/basic_regex.hpp boost_1_34_1.pm/boost/rege
  namespace boost{
  #ifdef BOOST_MSVC
  #pragma warning(push)
-diff -urp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex_parser.hpp
---- boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-02-06 17:45:26.000000000 +0100
-+++ boost_1_34_1.pm/boost/regex/v4/basic_regex_parser.hpp      2008-02-06 17:38:58.000000000 +0100
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
+Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp      2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp   2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ #pragma warning(pop)
  #endif
  
 +#include <limits.h>
@@ -45,22 +102,12 @@ diff -urp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1.pm/boo
  namespace boost{
  namespace re_detail{
  
-diff -urp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1.pm/boost/regex/v4/cpp_regex_traits.hpp
---- boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp   2007-01-15 12:09:44.000000000 +0100
-+++ boost_1_34_1.pm/boost/regex/v4/cpp_regex_traits.hpp        2008-02-06 17:26:51.000000000 +0100
-@@ -41,6 +41,7 @@
- 
- #include <istream>
- #include <ios>
-+#include <limits.h>
- 
- #ifdef BOOST_HAS_ABI_HEADERS
- #  include BOOST_ABI_PREFIX
-diff -urp boost_1_34_1/boost/regex/v4/perl_matcher.hpp boost_1_34_1.pm/boost/regex/v4/perl_matcher.hpp
---- boost_1_34_1/boost/regex/v4/perl_matcher.hpp       2006-10-18 14:55:30.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/perl_matcher.hpp    2008-02-06 17:39:44.000000000 +0100
-@@ -18,6 +18,8 @@
- #  include BOOST_ABI_PREFIX
+Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_parser.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp    2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ #  pragma warning(disable: 4800)
  #endif
  
 +#include <limits.h>
@@ -68,9 +115,10 @@ diff -urp boost_1_34_1/boost/regex/v4/perl_matcher.hpp boost_1_34_1.pm/boost/reg
  namespace boost{
  namespace re_detail{
  
-diff -urp boost_1_34_1/boost/regex/v4/regex_split.hpp boost_1_34_1.pm/boost/regex/v4/regex_split.hpp
---- boost_1_34_1/boost/regex/v4/regex_split.hpp        2005-01-21 18:22:38.000000000 +0100
-+++ boost_1_34_1.pm/boost/regex/v4/regex_split.hpp     2008-02-06 17:42:13.000000000 +0100
+Only in boost_1_36_0_beta1/boost/regex/v4: perl_matcher.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp     2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp  2008-08-11 23:50:38.000000000 +0200
 @@ -21,6 +21,8 @@
  #ifndef BOOST_REGEX_SPLIT_HPP
  #define BOOST_REGEX_SPLIT_HPP
@@ -79,12 +127,13 @@ diff -urp boost_1_34_1/boost/regex/v4/regex_split.hpp boost_1_34_1.pm/boost/rege
 +
  namespace boost{
  
- #ifdef BOOST_HAS_ABI_HEADERS
-diff -urp boost_1_34_1/boost/regex/v4/states.hpp boost_1_34_1.pm/boost/regex/v4/states.hpp
---- boost_1_34_1/boost/regex/v4/states.hpp     2005-09-20 14:01:25.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/states.hpp  2008-02-06 17:32:42.000000000 +0100
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
+ #ifdef BOOST_MSVC
+Only in boost_1_36_0_beta1/boost/regex/v4: regex_split.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp boost_1_36_0_beta1/boost/regex/v4/states.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp  2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/states.hpp       2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ #pragma warning(pop)
  #endif
  
 +#include <limits.h>
@@ -92,20 +141,10 @@ diff -urp boost_1_34_1/boost/regex/v4/states.hpp boost_1_34_1.pm/boost/regex/v4/
  namespace boost{
  namespace re_detail{
  
-diff -urp boost_1_34_1/boost/test/test_tools.hpp boost_1_34_1.pm/boost/test/test_tools.hpp
---- boost_1_34_1/boost/test/test_tools.hpp     2007-02-22 18:57:29.000000000 +0100
-+++ boost_1_34_1.pm/boost/test/test_tools.hpp  2008-02-06 17:18:20.000000000 +0100
-@@ -44,6 +44,7 @@
- // STL
- #include <cstddef>          // for std::size_t
- #include <iosfwd>
-+#include <limits.h>
- 
- #include <boost/test/detail/suppress_warnings.hpp>
- 
-diff -urp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1.pm/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
---- boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp        2006-12-20 17:38:24.000000000 +0100
-+++ boost_1_34_1.pm/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp     2008-02-06 17:25:00.000000000 +0100
+Only in boost_1_36_0_beta1/boost/regex/v4: states.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+--- boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp     2008-08-11 23:49:45.000000000 +0200
++++ boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp  2008-08-11 23:50:38.000000000 +0200
 @@ -16,6 +16,8 @@
  #include <string>
  #include <cstdio>
@@ -115,101 +154,4 @@ diff -urp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34
  #if defined(BOOST_SPIRIT_DEBUG)
  #include <iostream>
  #endif // defined(BOOST_SPIRIT_DEBUG)
-diff -urp boost_1_34_1/boost/wave/util/flex_string.hpp boost_1_34_1.pm/boost/wave/util/flex_string.hpp
---- boost_1_34_1/boost/wave/util/flex_string.hpp       2006-04-25 19:21:01.000000000 +0200
-+++ boost_1_34_1.pm/boost/wave/util/flex_string.hpp    2008-02-06 17:22:31.000000000 +0100
-@@ -94,6 +94,7 @@ class StoragePolicy
- #include <limits>
- #include <stdexcept>
- #include <cstddef>
-+#include <cstring>
- 
- // this must occur after all of the includes and before any code appears
- #ifdef BOOST_HAS_ABI_HEADERS
-diff -urp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp boost_1_34_1.pm/boost/archive/polymorphic_iarchive.hpp
---- boost_1_34_1/boost/archive/polymorphic_iarchive.hpp        2005-12-11 07:12:51.000000000 +0100
-+++ boost_1_34_1.pm/boost/archive/polymorphic_iarchive.hpp     2008-02-06 18:42:07.000000000 +0100
-@@ -33,6 +33,8 @@ namespace std{
- #include <boost/archive/detail/interface_iarchive.hpp>
- #include <boost/serialization/nvp.hpp>
- 
-+#include <limits.h>
-+
- // determine if its necessary to handle (u)int64_t specifically
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
-diff -urp boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
---- boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp   2008-10-06 15:38:51.000000000 +0200
-+++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp        2008-10-06 15:38:57.000000000 +0200
-@@ -32,6 +32,8 @@ namespace std{
- #include <boost/archive/detail/interface_oarchive.hpp>
- #include <boost/serialization/nvp.hpp>
- 
-+#include <limits.h>
-+
- // determine if its necessary to handle (u)int64_t specifically
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
-diff -urp boost_1_34_1/boost/date_time/date_facet.hpp boost_1_34_1-pm/boost/date_time/date_facet.hpp
---- boost_1_34_1/boost/date_time/date_facet.hpp        2005-09-05 23:10:50.000000000 +0200
-+++ boost_1_34_1-pm/boost/date_time/date_facet.hpp     2008-02-13 16:07:59.000000000 +0100
-@@ -429,7 +429,7 @@ namespace boost { namespace date_time {
-     typedef std::basic_string<CharT> string_type;
-     typedef CharT                    char_type;
-     typedef boost::date_time::period_parser<date_type, CharT>  period_parser_type;
--    typedef special_values_parser<date_type,CharT> special_values_parser_type; 
-+    typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; 
-     typedef std::vector<std::basic_string<CharT> > input_collection_type;
-     typedef format_date_parser<date_type, CharT> format_date_parser_type;
-     // date_generators stuff goes here
-diff -urp boost_1_34_1/boost/python/detail/def_helper.hpp boost_1_34_1-pm/boost/python/detail/def_helper.hpp
---- boost_1_34_1/boost/python/detail/def_helper.hpp    2004-09-16 03:00:28.000000000 +0200
-+++ boost_1_34_1-pm/boost/python/detail/def_helper.hpp 2008-02-14 13:26:23.000000000 +0100
-@@ -155,7 +155,7 @@ namespace detail
-           , T3 const&
-           , T4 const&
-           , default_call_policies
--          , keywords<0>
-+          , boost::python::detail::keywords<0>
-           , char const*
-           , void(not_specified::*)()   // A function pointer type which is never an
-                                        // appropriate default implementation
-diff -urp new-boost/date_time/tz_db_base.hpp old-boost/date_time/tz_db_base.hpp
---- boost_1_34_1/boost/date_time/tz_db_base.hpp        2008-06-12 13:03:34.000000000 +0200
-+++ boost_1_34_1-pm/boost/date_time/tz_db_base.hpp     2008-06-12 12:59:43.000000000 +0200
-@@ -158,7 +158,7 @@ namespace boost {
-       typedef typename time_zone_type::base_type time_zone_base_type;
-       typedef typename time_zone_type::time_duration_type time_duration_type;
-       typedef time_zone_names_base<char_type> time_zone_names;
--      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-+      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets_t;
-       typedef std::basic_string<char_type> string_type;
- 
-       //! Constructs an empty database
-@@ -346,18 +346,18 @@ namespace boost {
-         time_duration_type utc_offset = 
-           str_from_delimited_time_duration<time_duration_type,char_type>(result[GMTOFFSET]);
-         
--        dst_adjustment_offsets adjust(time_duration_type(0,0,0),
--                                      time_duration_type(0,0,0),
--                                      time_duration_type(0,0,0));
-+        dst_adjustment_offsets_t adjust(time_duration_type(0,0,0),
-+                                      time_duration_type(0,0,0),
-+                                      time_duration_type(0,0,0));
- 
-         boost::shared_ptr<rule_type> rules;
- 
-         if(has_dst){
--          adjust = dst_adjustment_offsets(
--                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
--                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
--                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
--                                          );
-+          adjust = dst_adjustment_offsets_t(
-+                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
-+                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
-+                                          str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
-+                                          );
- 
-           rules = 
-             boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
+Only in boost_1_36_0_beta1/boost/wave/cpplexer/re2clex: cpp_re2c_lexer.hpp.orig

diff --git a/boost-regex.patch b/boost-regex.patch
deleted file mode 100644 (file)
index 9260afc..0000000
--- a/boost-regex.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-*** boost/regex/v4/basic_regex_parser.hpp.orig 2008-01-14 12:53:01.000000000 -0600
---- boost/regex/v4/basic_regex_parser.hpp      2008-01-14 12:57:25.000000000 -0600
-*************** bool basic_regex_parser<charT, traits>::
-*** 777,782 ****
---- 777,783 ----
-        case syntax_element_restart_continue:
-        case syntax_element_jump:
-        case syntax_element_startmark:
-+       case syntax_element_backstep:
-           // can't legally repeat any of the above:
-           fail(regex_constants::error_badrepeat, m_position - m_base);
-           return false;
-*************** bool basic_regex_parser<charT, traits>::
-*** 1862,1867 ****
---- 1863,1869 ----
-     if(markid == -4)
-     {
-        re_syntax_base* b = this->getaddress(expected_alt_point);
-+       // Make sure we have exactly one alternative following this state:
-        if(b->type != syntax_element_alt)
-        {
-           re_alt* alt = static_cast<re_alt*>(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt)));
-*************** bool basic_regex_parser<charT, traits>::
-*** 1872,1877 ****
---- 1874,1888 ----
-           fail(regex_constants::error_bad_pattern, m_position - m_base);
-           return false;
-        }
-+       // check for invalid repetition of next state:
-+       b = this->getaddress(expected_alt_point);
-+       b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
-+       if((b->type != syntax_element_assert_backref)
-+          && (b->type != syntax_element_startmark))
-+       {
-+          fail(regex_constants::error_badrepeat, m_position - m_base);
-+          return false;
-+       }
-     }
-     //
-     // append closing parenthesis state:

diff --git a/boost-run-tests.patch b/boost-run-tests.patch
index ee39db0..adcc5f2 100644 (file)
--- a/boost-run-tests.patch
+++ b/boost-run-tests.patch
@@ -1,5 +1,5 @@
-*** tools/regression/run_tests.sh.orig 2007-07-31 19:44:25.000000000 -0500
---- tools/regression/run_tests.sh      2007-08-01 12:17:25.000000000 -0500
+*** tools/regression/src/run_tests.sh.orig     2007-07-31 19:44:25.000000000 -0500
+--- tools/regression/src/run_tests.sh  2007-08-01 12:17:25.000000000 -0500
 ***************
 *** 15,21 ****
   # This can be either a non-exitent directory or an already complete Boost

diff --git a/boost-unneccessary_iostreams.patch b/boost-unneccessary_iostreams.patch
new file mode 100644 (file)
index 0000000..a2d3f4b
--- /dev/null
+++ b/boost-unneccessary_iostreams.patch
@@ -0,0 +1,11 @@
+diff -ru boost_1_37_0.orig/boost/spirit/home/classic/iterator/multi_pass.hpp boost_1_37_0/boost/spirit/home/classic/iterator/multi_pass.hpp
+--- boost/spirit/home/classic/iterator/multi_pass.hpp  2009-01-09 10:38:36.000000000 +0000
++++ boost/spirit/home/classic/iterator/multi_pass.hpp  2009-01-09 10:39:41.000000000 +0000
+@@ -12,7 +12,6 @@
+ #include <boost/throw_exception.hpp>
+ #include <deque>
+ #include <iterator>
+-#include <iostream>
+ #include <algorithm>    // for std::swap
+ #include <exception>    // for std::exception
+ #include <boost/limits.hpp>

diff --git a/boost-use-rpm-optflags.patch b/boost-use-rpm-optflags.patch
deleted file mode 100644 (file)
index 6fe2960..0000000
--- a/boost-use-rpm-optflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** tools/build/v2/tools/gcc.jam.orig  2007-08-01 01:17:16.000000000 -0500
---- tools/build/v2/tools/gcc.jam       2007-08-01 01:17:46.000000000 -0500
-*************** flags gcc.compile PCH_FILE <pch>on : <pc
-*** 268,274 ****
-  
-  # Declare flags and action for compilation
-  flags gcc.compile OPTIONS <optimization>off : -O0 ;
-! flags gcc.compile OPTIONS <optimization>speed : -O3 ;
-  flags gcc.compile OPTIONS <optimization>space : -Os ;
-  
-  flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
---- 268,274 ----
-  
-  # Declare flags and action for compilation
-  flags gcc.compile OPTIONS <optimization>off : -O0 ;
-! flags gcc.compile OPTIONS <optimization>speed : "$RPM_OPT_FLAGS" ;
-  flags gcc.compile OPTIONS <optimization>space : -Os ;
-  
-  flags gcc.compile OPTIONS <inlining>off : -fno-inline ;

diff --git a/boost.spec b/boost.spec
index 2bd5703..3c21503 100644 (file)
--- a/boost.spec
+++ b/boost.spec
@@ -1,13 +1,14 @@
 %bcond_with tests
+%define sonamever 4
 
 Name: boost
 Summary: The Boost C++ Libraries
-Version: 1.40.0
-Release: 0%{?dist}
+Version: 1.37.0
+Release: 6%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/boost/boost_1_40_0.tar.bz2
+Source: boost_1_37_0.tar.bz2
 Obsoletes: boost-doc <= 1.30.2
 Obsoletes: boost-python <= 1.30.2
 Provides: boost-python = %{version}-%{release}
@@ -19,12 +20,16 @@ BuildRequires: bzip2-devel
 BuildRequires: zlib-devel
 BuildRequires: python-devel
 BuildRequires: libicu-devel
+BuildRequires: chrpath
 Patch0: boost-configure.patch
-Patch1: boost-gcc-soname.patch
-Patch2: boost-use-rpm-optflags.patch
-Patch3: boost-run-tests.patch
-Patch4: boost-regex.patch
-Patch5: boost-gcc43.patch
+Patch1: boost-use-rpm-optflags.patch
+Patch2: boost-run-tests.patch
+Patch3: boost-gcc43.patch
+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
@@ -63,13 +68,16 @@ Provides: boost-python-docs = %{version}-%{release}
 HTML documentation files for Boost C++ libraries.
 
 %prep
-%setup -q -n %{name}_1_34_1
+%setup -q -n %{name}_1_37_0
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1
+%patch3 -p1
+sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0
+%patch5 -p0
+%patch6 -p0
+sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0
+%patch8 -p1
 
 %build
 BOOST_ROOT=`pwd`
@@ -80,7 +88,6 @@ export BOOST_ROOT
 (cd tools/jam/src && ./build.sh)
 BJAM=`find tools/jam/src/ -name bjam -a -type f`
 
-#BUILD_FLAGS="--with-toolset=gcc --prefix=$RPM_BUILD_ROOT%{_prefix}"
 BUILD_FLAGS="--with-toolset=gcc"
 PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
 PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION"
@@ -135,16 +142,21 @@ for i in `find stage -type f -name \*.a`; do
 done;
 for i in `find stage -type f -name \*.so`; do
   NAME=$i;
-  SONAME=$i.3;
+  SONAME=$i.%{sonamever};
   VNAME=$i.%{version};
   base=`basename $i`;
   NAMEbase=$base;
-  SONAMEbase=$base.3;
+  SONAMEbase=$base.%{sonamever};
   VNAMEbase=$base.%{version};
   mv $i $VNAME;
+
+  # remove rpath
+  chrpath --delete $VNAME;
+
   ln -s $VNAMEbase $SONAME;
   ln -s $VNAMEbase $NAME;
-  install -p -m 755 $VNAME $RPM_BUILD_ROOT%{_libdir}/$VNAMEbase;
+  install -p -m 755 $VNAME $RPM_BUILD_ROOT%{_libdir}/$VNAMEbase; 
+
   mv $SONAME $RPM_BUILD_ROOT%{_libdir}/$SONAMEbase;
   mv $NAME $RPM_BUILD_ROOT%{_libdir}/$NAMEbase;
 done;
@@ -153,7 +165,7 @@ done;
 find %{name} -type d | while read a; do
   mkdir -p $RPM_BUILD_ROOT%{_includedir}/$a
   find $a -mindepth 1 -maxdepth 1 -type f \
-    | xargs -r install -m 644 -p -t $RPM_BUILD_ROOT%{_includedir}/$a
+  | xargs -r install -m 644 -p -t $RPM_BUILD_ROOT%{_includedir}/$a
 done
 
 # install doc files
@@ -164,7 +176,7 @@ find libs doc more -type f \( -name \*.htm -o -name \*.html \) \
 sed "s:^:$DOCPATH:" tmp-doc-directories | xargs -r mkdir -p
 cat tmp-doc-directories | while read a; do
     find $a -mindepth 1 -maxdepth 1 -name \*.htm\* \
-        | xargs install -m 644 -p -t $DOCPATH$a
+    | xargs install -m 644 -p -t $DOCPATH$a
 done
 rm tmp-doc-directories
 install -p -m 644 -t $DOCPATH LICENSE_1_0.txt index.htm
@@ -182,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root, -)
 %{_libdir}/*.so.%{version}
-%{_libdir}/*.so.3
+%{_libdir}/*.so.%{sonamever}
 
 %files devel
 %defattr(-, root, root, -)
@@ -198,10 +210,46 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Mar 23 2009 Petr Machata <pmachata@redhat.com> - 1.37.0-6
+- 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@lists.fedoraproject.org> - 1.37.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 12 2009 Petr Machata <pmachata@redhat.com> - 1.37.0-3
+- Apply a unneccessary_iostreams patch from Caolan McNamara
+- Fix soname patch so that it applies with fuzz=0.  Use fuzz=0 option
+  in spec file just like ordinary patches do.
+- Resolves: #479409
+
+* Fri Dec 19 2008 Petr Machata <pmachata@redhat.com> - 1.37.0-2
+- Apply a function_template patch from Caolan McNamara
+- Resolves: #477131
+
+* Tue Dec 16 2008 Benjamin Kosnik <bkoz@redhat.com> - 1.37.0-1
+- Fix rpmlint rpath errors.
+- Fix rpmlint warnings on tabs and spaces.
+- Bump SONAME to 4
+
+* Tue Nov 17 2008 Benjamin Kosnik <bkoz@redhat.com> - 1.37.0-0.1
+- Rebase to 1.37.0.
+
+* Tue Oct 21 2008 Benjamin Kosnik <bkoz@redhat.com> - 1.36.0-1
+- Rebase to 1.36.0.
+
 * Mon Oct  6 2008 Petr Machata <pmachata@redhat.com> - 1.34.1-17
 - Fix gcc43 patch to apply cleanly under --fuzz=0
 - Resolves: #465003
 
+* Mon Aug 11 2008 Petr Machata <pmachata@redhat.com> - 1.36.0-0.1.beta1
+- Rebase to 1.36.0.beta1
+  - Drop boost-regex.patch and portions of boost-gcc43.patch, port the rest
+  - Automate SONAME tracking and bump SONAME to 4
+  - Adjust boost-configure.patch to include threading=single,multi explicitly
+
 * Thu Jun 12 2008 Petr Machata <pmachata@redhat.com> - 1.34.1-16
 - Fix "changes meaning of keywords" in boost date_time
 - Related: #450718