diff --git a/SOURCES/boost-1.53.0-buildflags.patch b/SOURCES/boost-1.53.0-buildflags.patch new file mode 100644 index 0000000..09ed10a --- /dev/null +++ b/SOURCES/boost-1.53.0-buildflags.patch @@ -0,0 +1,30 @@ +diff -up boost_1_53_0/tools/build/v2/tools/gcc.jam\~ boost_1_53_0/tools/build/v2/tools/gcc.jam +--- boost_1_53_0/tools/build/v2/tools/gcc.jam~ 2012-04-26 05:35:55.000000000 +0200 ++++ boost_1_53_0/tools/build/v2/tools/gcc.jam 2014-02-28 16:32:22.575212631 +0100 +@@ -363,24 +363,6 @@ generators.override gcc.compile.c++.pch + + toolset.flags gcc.compile PCH_FILE on : ; + +-# Declare flags and action for compilation. +-toolset.flags gcc.compile OPTIONS off : -O0 ; +-toolset.flags gcc.compile OPTIONS speed : -O3 ; +-toolset.flags gcc.compile OPTIONS space : -Os ; +- +-toolset.flags gcc.compile OPTIONS off : -fno-inline ; +-toolset.flags gcc.compile OPTIONS on : -Wno-inline ; +-toolset.flags gcc.compile OPTIONS full : -finline-functions -Wno-inline ; +- +-toolset.flags gcc.compile OPTIONS off : -w ; +-toolset.flags gcc.compile OPTIONS on : -Wall ; +-toolset.flags gcc.compile OPTIONS all : -Wall -pedantic ; +-toolset.flags gcc.compile OPTIONS on : -Werror ; +- +-toolset.flags gcc.compile OPTIONS on : -g ; +-toolset.flags gcc.compile OPTIONS on : -pg ; +-toolset.flags gcc.compile OPTIONS off : -fno-rtti ; +- + rule setup-fpic ( targets * : sources * : properties * ) + { + local link = [ feature.get-values link : $(properties) ] ; + +Diff finished. Fri Feb 28 16:32:24 2014 diff --git a/SOURCES/boost-1.53.0-mpi-version_type.patch b/SOURCES/boost-1.53.0-mpi-version_type.patch new file mode 100644 index 0000000..7a62f06 --- /dev/null +++ b/SOURCES/boost-1.53.0-mpi-version_type.patch @@ -0,0 +1,23 @@ +diff -up boost_1_53_0/boost/mpi/datatype.hpp\~ boost_1_53_0/boost/mpi/datatype.hpp +--- boost_1_53_0/boost/mpi/datatype.hpp~ 2010-10-18 08:22:09.000000000 +0200 ++++ boost_1_53_0/boost/mpi/datatype.hpp 2014-02-19 03:14:48.564100698 +0100 +@@ -332,7 +332,7 @@ struct is_mpi_datatype + #ifndef BOOST_MPI_DOXYGEN + // direct support for special primitive data types of the serialization library + BOOST_MPI_DATATYPE(boost::archive::library_version_type, get_mpi_datatype(uint_least16_t()), integer); +-BOOST_MPI_DATATYPE(boost::archive::version_type, get_mpi_datatype(uint_least8_t()), integer); ++BOOST_MPI_DATATYPE(boost::archive::version_type, get_mpi_datatype(uint_least32_t()), integer); + BOOST_MPI_DATATYPE(boost::archive::class_id_type, get_mpi_datatype(int_least16_t()), integer); + BOOST_MPI_DATATYPE(boost::archive::class_id_reference_type, get_mpi_datatype(int_least16_t()), integer); + BOOST_MPI_DATATYPE(boost::archive::class_id_optional_type, get_mpi_datatype(int_least16_t()), integer); +@@ -340,7 +340,7 @@ BOOST_MPI_DATATYPE(boost::archive::objec + BOOST_MPI_DATATYPE(boost::archive::object_reference_type, get_mpi_datatype(uint_least32_t()), integer); + BOOST_MPI_DATATYPE(boost::archive::tracking_type, get_mpi_datatype(bool()), builtin); + BOOST_MPI_DATATYPE(boost::serialization::collection_size_type, get_mpi_datatype(std::size_t()), integer); +-BOOST_MPI_DATATYPE(boost::serialization::item_version_type, get_mpi_datatype(uint_least8_t()), integer); ++BOOST_MPI_DATATYPE(boost::serialization::item_version_type, get_mpi_datatype(unsigned()), integer); + #endif // Doxygen + + + +Diff finished. Wed Feb 19 03:14:54 2014 diff --git a/SPECS/boost.spec b/SPECS/boost.spec index abcf2a7..d067da1 100644 --- a/SPECS/boost.spec +++ b/SPECS/boost.spec @@ -34,7 +34,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.53.0 %define version_enc 1_53_0 -Release: 14%{?dist} +Release: 18%{?dist} License: Boost and MIT and Python %define toplev_dirname %{name}_%{version_enc} @@ -198,6 +198,12 @@ Patch52: boost-1.54.0-thread-cond_variable_shadow.patch # This was already fixed upstream, so no tracking bug. Patch53: boost-1.54.0-pool-max_chunks_shadow.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1018355 +Patch54: boost-1.53.0-mpi-version_type.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1070789 +Patch55: boost-1.53.0-buildflags.patch + %bcond_with tests %bcond_with docs_generated @@ -660,6 +666,8 @@ a number of significant features and is now developed independently %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 +%patch55 -p1 # At least python2_version needs to be a macro so that it's visible in # %%install as well. @@ -679,7 +687,7 @@ a number of significant features and is now developed independently cat >> ./tools/build/v2/user-config.jam << EOF # There are many strict aliasing warnings, and it's not feasible to go # through them all at this time. -using gcc : : : -fno-strict-aliasing ; +using gcc : : : "$RPM_OPT_FLAGS -fno-strict-aliasing" ; using mpi ; %if %{with python3} # This _adds_ extra python version. It doesn't replace whatever @@ -1231,6 +1239,21 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/bjam.1* %changelog +* Fri Feb 28 2014 Petr Machata - 1.53.0-18 +- Turn off build flags pre-set by Boost distribution. + (boost-1.53.0-buildflags.patch) +- Pass RPM_OPT_FLAGS through user-config.jam. + +* Wed Feb 19 2014 Petr Machata - 1.53.0-15 +- Fix misunderstanding of Boost.MPI about widths of some + Boost.Serialization types. (boost-1.53.0-mpi-version_type.patch) + +* Fri Jan 24 2014 Daniel Mach - 1.53.0-16 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.53.0-15 +- Mass rebuild 2013-12-27 + * Wed Oct 2 2013 Petr Machata - 1.53.0-14 - MPICH2 became MPICH -- rename subpackages, dependencies and conditionals.