rpms/boost/devel .cvsignore, 1.9, 1.10 boost-configure.patch, 1.1, 1.2 boost-gcc-soname.patch, 1.2, 1.3 boost-gcc43.patch, 1.5, 1.6 boost-run-tests.patch, 1.1, 1.2 boost-use-rpm-optflags.patch, 1.1, 1.2 boost.spec, 1.50, 1.51 sources, 1.11, 1.12 boost-regex.patch, 1.1, NONE

Petr Machata (pmachata) fedora-extras-commits at redhat.com
Mon Aug 11 21:24:43 UTC 2008


Author: pmachata

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16743

Modified Files:
	.cvsignore boost-configure.patch boost-gcc-soname.patch 
	boost-gcc43.patch boost-run-tests.patch 
	boost-use-rpm-optflags.patch boost.spec sources 
Removed Files:
	boost-regex.patch 
Log Message:
- 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	2 Aug 2007 05:48:06 -0000	1.9
+++ .cvsignore	11 Aug 2008 21:24:13 -0000	1.10
@@ -1 +1,2 @@
 boost_1_34_1.tar.bz2
+boost_1_36_0_beta1.tar.bz2

boost-configure.patch:

Index: boost-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boost-configure.patch	2 Aug 2007 05:48:06 -0000	1.1
+++ boost-configure.patch	11 Aug 2008 21:24:13 -0000	1.2
@@ -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=

boost-gcc-soname.patch:

Index: boost-gcc-soname.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost-gcc-soname.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boost-gcc-soname.patch	3 Aug 2007 02:57:47 -0000	1.2
+++ boost-gcc-soname.patch	11 Aug 2008 21:24:13 -0000	1.3
@@ -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 doesn't 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 @@
+ # 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)" $(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)
+ }
+ 
+ # Set up threading support. It's somewhat contrived, so perform it at the end,

boost-gcc43.patch:

Index: boost-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost-gcc43.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- boost-gcc43.patch	12 Jun 2008 11:12:04 -0000	1.5
+++ boost-gcc43.patch	11 Aug 2008 21:24:13 -0000	1.6
@@ -1,14 +1,3 @@
-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>
-+#include <limits.h>
- 
- ///////////////////////////////////////////////////////////////////////////////
- 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
@@ -45,17 +34,6 @@
  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
@@ -92,17 +70,6 @@
  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
@@ -115,17 +82,6 @@
  #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
@@ -150,30 +106,6 @@
  // 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

boost-run-tests.patch:

Index: boost-run-tests.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost-run-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boost-run-tests.patch	2 Aug 2007 05:48:06 -0000	1.1
+++ boost-run-tests.patch	11 Aug 2008 21:24:13 -0000	1.2
@@ -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

boost-use-rpm-optflags.patch:

Index: boost-use-rpm-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost-use-rpm-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boost-use-rpm-optflags.patch	2 Aug 2007 05:48:06 -0000	1.1
+++ boost-use-rpm-optflags.patch	11 Aug 2008 21:24:13 -0000	1.2
@@ -1,19 +1,13 @@
-*** 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 -urp boost_1_36_0_beta1-orig/tools/build/v2/tools/gcc.jam boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam
+--- boost_1_36_0_beta1-orig/tools/build/v2/tools/gcc.jam	2008-08-11 13:58:22.000000000 +0200
++++ boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam	2008-08-11 13:59:21.000000000 +0200
+@@ -288,7 +288,7 @@ flags gcc.compile PCH_FILE <pch>on : <pc
+ 
+ # 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>speed : "$RPM_OPT_FLAGS" ;
+ flags gcc.compile OPTIONS <optimization>space : -Os ;
+ 
+ flags gcc.compile OPTIONS <inlining>off  : -fno-inline ;
+Only in boost_1_36_0_beta1/tools/build/v2/tools: gcc.jam~


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- boost.spec	12 Jun 2008 11:12:04 -0000	1.50
+++ boost.spec	11 Aug 2008 21:24:13 -0000	1.51
@@ -1,13 +1,18 @@
 %bcond_with tests
+%define sonamever 4
 
 Name: boost
 Summary: The Boost C++ Libraries
-Version: 1.34.1
-Release: 16%{?dist}
+Version: 1.36.0
+Release: 0.1.beta1%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/boost/boost_1_34_1.tar.bz2
+# boost_1_36_0_beta1.tar.bz2 comes from svn checkout:
+#  svn co http://svn.boost.org/svn/boost/tags/release/Boost_1_36_0_beta1 \
+#    boost_1_36_0_beta1 -r 47919
+Source: boost_1_36_0_beta1.tar.bz2
+Source2: boost-gcc-soname.patch
 Obsoletes: boost-doc <= 1.30.2
 Obsoletes: boost-python <= 1.30.2
 Provides: boost-python = %{version}-%{release}
@@ -20,10 +25,8 @@
 BuildRequires: python-devel
 BuildRequires: libicu-devel
 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
 
 %description
@@ -63,12 +66,11 @@
 HTML documentation files for Boost C++ libraries.
 
 %prep
-%setup -q -n %{name}_1_34_1
+%setup -q -n %{name}_1_36_0_beta1
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+sed 's/!!!SONAME!!!/%{sonamever}/' %{SOURCE2} | %{__patch} -p1
+%patch2 -p1
 %patch3 -p0
-%patch4 -p0
 %patch5 -p1
 
 %build
@@ -135,11 +137,11 @@
 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;
   ln -s $VNAMEbase $SONAME;
@@ -182,7 +184,7 @@
 %files
 %defattr(-, root, root, -)
 %{_libdir}/*.so.%{version}
-%{_libdir}/*.so.3
+%{_libdir}/*.so.%{sonamever}
 
 %files devel
 %defattr(-, root, root, -)
@@ -198,6 +200,12 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Aug 11 2008 Petr Machata <pmachata at 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 at redhat.com> - 1.34.1-16
 - Fix "changes meaning of keywords" in boost date_time
 - Related: #450718


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Aug 2007 05:48:06 -0000	1.11
+++ sources	11 Aug 2008 21:24:13 -0000	1.12
@@ -1 +1 @@
-2d938467e8a448a2c9763e0a9f8ca7e5  boost_1_34_1.tar.bz2
+b70fdfdfb6a2ec9cc1b73095c67293cd  boost_1_36_0_beta1.tar.bz2


--- boost-regex.patch DELETED ---




More information about the fedora-extras-commits mailing list