diff --git a/boost-1.42.0-qualify_template_arity.patch b/boost-1.42.0-qualify_template_arity.patch new file mode 100644 index 0000000..d155c26 --- /dev/null +++ b/boost-1.42.0-qualify_template_arity.patch @@ -0,0 +1,31 @@ +Providing explicit specialization prevents implicit instantiations, so +argument-dependent lookup just doesn't consider another scope. +See also +http://lists.boost.org/Archives/boost/2010/04/165303.php +https://svn.boost.org/trac/boost/ticket/4061 +https://svn.boost.org/trac/boost/changeset/61467 + +diff -Nurp boost_1_42_0.old//boost/mpl/aux_/preprocessed/gcc/template_arity.hpp boost_1_42_0/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp +--- boost/mpl/aux_/preprocessed/gcc/template_arity.hpp 2010-04-01 21:57:59.000000000 +0200 ++++ boost/mpl/aux_/preprocessed/gcc/template_arity.hpp 2010-04-01 21:59:13.000000000 +0200 +@@ -83,7 +83,7 @@ template< typename F, int N > + struct template_arity_impl + { + BOOST_STATIC_CONSTANT(int, value = +- sizeof(arity_helper(type_wrapper(), arity_tag())) - 1 ++ sizeof(::boost::mpl::aux::arity_helper(type_wrapper(), arity_tag())) - 1 + ); + }; + +diff -Nurp boost_1_42_0.old//boost/mpl/aux_/template_arity.hpp boost_1_42_0/boost/mpl/aux_/template_arity.hpp +--- boost/mpl/aux_/template_arity.hpp 2010-04-01 21:57:59.000000000 +0200 ++++ boost/mpl/aux_/template_arity.hpp 2010-04-01 21:58:54.000000000 +0200 +@@ -98,7 +98,7 @@ template< typename F, BOOST_MPL_AUX_NTTP + struct template_arity_impl + { + BOOST_STATIC_CONSTANT(int, value = +- sizeof(arity_helper(type_wrapper(),arity_tag())) - 1 ++ sizeof(::boost::mpl::aux::arity_helper(type_wrapper(),arity_tag())) - 1 + ); + }; + diff --git a/boost.changes b/boost.changes index 82aafd2..1716a33 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jul 9 13:17:57 CEST 2010 - pth@suse.de + +- Rename patch to be identical to the one checked in for 11.3. + The patch adds an explicite specialization to the call to prevent + unwanted temporary instantiations. + + +------------------------------------------------------------------- +Fri Jul 9 09:34:03 UTC 2010 - lnussel@suse.de + +- fix bug that shows with gcc 4.5 (bnc#621140) + ------------------------------------------------------------------- Wed Jun 16 14:46:52 CEST 2010 - pth@suse.de diff --git a/boost.spec b/boost.spec index 356077d..3cfaef4 100644 --- a/boost.spec +++ b/boost.spec @@ -68,7 +68,7 @@ Group: Development/Libraries/C and C++ Summary: Boost C++ Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: %{ver} -Release: 6 +Release: 9 Source0: %{name}_%{file_version}.tar.bz2 Source1: boost-rpmlintrc Source2: %{name}_man_%{file_version}.tar.bz2 @@ -85,6 +85,7 @@ Patch21: boost-lib64.patch Patch22: boost-fix_ICU_test.patch Patch50: boost-use_std_xml_catalog.patch Patch51: boost-fix_documentation.patch +Patch52: boost-1.42.0-qualify_template_arity.patch Recommends: %{all_libs} %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -125,6 +126,7 @@ the documentation packages (html, man or pdf). %package -n boost-license%{lib_appendix} + License: BSD3c Summary: Boost License Group: Development/Libraries/C and C++ @@ -187,6 +189,7 @@ in PDF format. %package -n libboost_date_time%{lib_appendix} + License: BSD3c Summary: Boost::Date.Time Runtime libraries Group: System/Libraries @@ -200,6 +203,7 @@ This package contains the Boost Date.Time runtime libraries. %package -n libboost_filesystem%{lib_appendix} + License: BSD3c Summary: Boost::Filesystem Runtime Libraries Group: System/Localization @@ -213,6 +217,7 @@ This package contains the Boost::Filesystem libraries. %package -n libboost_graph%{lib_appendix} + License: BSD3c Summary: Boost::Graph Runtime Libraries Group: System/Libraries @@ -226,6 +231,7 @@ This package contains the Boost::Graph Runtime libraries. %package -n libboost_iostreams%{lib_appendix} + License: BSD3c Summary: Boost::IOStreams Runtime Libraries Group: System/Libraries @@ -239,6 +245,7 @@ This package contains the Boost::IOStreams Runtime libraries. %package -n libboost_math%{lib_appendix} + License: BSD3c Summary: Boost::Math Runtime Libraries Group: System/Libraries @@ -253,6 +260,7 @@ This package contains the Boost::Math Runtime libraries. %package -n libboost_mpi%{lib_appendix} + License: BSD3c Summary: Boost::MPI Runtime libraries Group: System/Libraries @@ -280,6 +288,7 @@ This package contains the Boost::Test runtime libraries. %package -n libboost_program_options%{lib_appendix} + License: BSD3c Summary: Boost::ProgramOptions Runtime libraries Group: System/Libraries @@ -293,6 +302,7 @@ This package contains the Boost::ProgramOptions Runtime libraries. %package -n libboost_python%{lib_appendix} + License: BSD3c Summary: Boost::Python Runtime Libraries Group: System/Libraries @@ -306,6 +316,7 @@ This package contains the Boost::Python Runtime libraries. %package -n libboost_serialization%{lib_appendix} + License: BSD3c Summary: Boost::Serialization Runtime Libraries Group: System/Libraries @@ -319,6 +330,7 @@ This package contains the Boost::Serialization Runtime libraries. %package -n libboost_signals%{lib_appendix} + License: BSD3c Summary: Boost::Signals Runtime Libraries Group: System/Libraries @@ -332,6 +344,7 @@ This package contains the Boost::Signals Runtime libraries. %package -n libboost_system%{lib_appendix} + License: BSD3c Summary: Boost::System Runtime Libraries Group: System/Libraries @@ -345,6 +358,7 @@ This package contains the Boost::System runtime libraries. %package -n libboost_thread%{lib_appendix} + License: BSD3c Summary: Boost::Thread Runtime Libraries Group: System/Libraries @@ -358,6 +372,7 @@ This package contains the Boost::Thread runtime libraries. %package -n libboost_wave%{lib_appendix} + License: BSD3c Summary: Boost::Wave Runtime Libraries Group: System/Libraries @@ -371,6 +386,7 @@ This package contains the Boost::Wave runtime libraries. %package -n libboost_regex%{lib_appendix} + License: BSD3c Summary: The Boost::Regex runtime library Group: System/Libraries @@ -402,6 +418,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch22 %patch50 %patch51 +%patch52 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} +