diff --git a/boost-1.63.0-function-may-alias.patch b/boost-1.63.0-function-may-alias.patch deleted file mode 100644 index 62b9f6e..0000000 --- a/boost-1.63.0-function-may-alias.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_1_63_0/boost/function/function_template.hpp.alias 2017-03-24 12:17:21.560125198 +0000 -+++ boost_1_63_0/boost/function/function_template.hpp 2017-03-24 13:07:24.971891166 +0000 -@@ -994,7 +994,7 @@ - if (!f.empty()) { - this->vtable = f.vtable; - if (this->has_trivial_copy_and_destroy()) -- this->functor = f.functor; -+ __builtin_memcpy(&this->functor, &f.functor, sizeof(f.functor)); - else - get_vtable()->base.manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); diff --git a/boost.spec b/boost.spec index d1369ba..b4de9a6 100644 --- a/boost.spec +++ b/boost.spec @@ -35,7 +35,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.63.0 %global version_enc 1_63_0 -Release: 7%{?dist} +Release: 8%{?dist} License: Boost and MIT and Python %global toplev_dirname %{name}_%{version_enc} @@ -130,9 +130,6 @@ Patch82: boost-1.60.0-no-rpath.patch # https://github.com/boostorg/build/issues/163 Patch83: boost-1.63.0-dual-python-build.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1422456 -Patch84: boost-1.63.0-function-may-alias.patch - %bcond_with tests %bcond_with docs_generated @@ -653,7 +650,6 @@ a number of significant features and is now developed independently %patch68 -p1 %patch82 -p0 %patch83 -p1 -%patch84 -p1 # At least python2_version needs to be a macro so that it's visible in # %%install as well. @@ -1295,6 +1291,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Sat Jul 01 2017 Jonathan Wakely - 1.63.0-8 +- Remove patch for boost::function strict aliasing problem (#1422456) + * Tue Apr 25 2017 Jonathan Wakely - 1.63.0-7 - Rebuild for rpm-mpi-hooks fix (#1435690)