From 0ef7d672066c19fcbfc397b7fddd3219cf5cd28a Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 30 Aug 2013 00:28:31 +0200 Subject: [PATCH] Fix atomic_cas32 in Boost.Interprocess --- boost-1.54.0-interprocess-atomic_cas32-ppc.patch | 14 ++++++++++++++ boost.spec | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 boost-1.54.0-interprocess-atomic_cas32-ppc.patch diff --git a/boost-1.54.0-interprocess-atomic_cas32-ppc.patch b/boost-1.54.0-interprocess-atomic_cas32-ppc.patch new file mode 100644 index 0000000..e5268d1 --- /dev/null +++ b/boost-1.54.0-interprocess-atomic_cas32-ppc.patch @@ -0,0 +1,14 @@ +diff -up boost_1_54_0/boost/interprocess/detail/atomic.hpp\~ boost_1_54_0/boost/interprocess/detail/atomic.hpp +--- boost_1_54_0/boost/interprocess/detail/atomic.hpp~ 2012-09-24 14:17:34.000000000 +0200 ++++ boost_1_54_0/boost/interprocess/detail/atomic.hpp 2013-08-29 16:36:51.682606594 +0200 +@@ -213,7 +213,7 @@ inline boost::uint32_t atomic_cas32 + "bne- 1b\n\t" + "2:" + : "=&r"(prev) +- : "b" (mem), "r"(cmp), "r" (with) ++ : "b" (mem), "r" (with), "r" (cmp) + : "cc", "memory"); + return prev; + } + +Diff finished. Thu Aug 29 16:36:55 2013 diff --git a/boost.spec b/boost.spec index f9a1e0d..0547256 100644 --- a/boost.spec +++ b/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: 13%{?dist} +Release: 14%{?dist} License: Boost and MIT and Python %define toplev_dirname %{name}_%{version_enc} @@ -202,6 +202,10 @@ 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=1002578 +# https://svn.boost.org/trac/boost/ticket/9065 +Patch55: boost-1.54.0-interprocess-atomic_cas32-ppc.patch + %bcond_with tests %bcond_with docs_generated @@ -685,6 +689,7 @@ a number of significant features and is now developed independently %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch55 -p1 # At least python2_version needs to be a macro so that it's visible in # %%install as well. @@ -1256,6 +1261,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/bjam.1* %changelog +* Thu Aug 29 2013 Petr Machata - 1.53.0-14 +- Fix atomic_cas32 (thanks Jaroslav Škarvada for figuring out where + the problem is) (boost-1.54.0-interprocess-atomic_cas32-ppc.patch) + * Fri Aug 23 2013 Petr Machata - 1.53.0-13 - Fix compilation of Boost.Pool test cases (boost-1.54.0-pool-test_linking.patch)