<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117769] trunk/dports/devel/boost</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117769">117769</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2014-03-12 09:24:13 -0700 (Wed, 12 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>devel/boost: add upstream patch to boost.atomic to fix compilation with clang 3.4 and later (including xcode 5.1). closes #42282</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelboostPortfile">trunk/dports/devel/boost/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelboostfilespatchatomicdiff">trunk/dports/devel/boost/files/patch-atomic.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelboostPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/boost/Portfile (117768 => 117769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/boost/Portfile        2014-03-11 14:24:56 UTC (rev 117768)
+++ trunk/dports/devel/boost/Portfile        2014-03-12 16:24:13 UTC (rev 117769)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> 
</span><span class="cx"> name            boost
</span><span class="cx"> version         1.55.0
</span><del>-revision        1
</del><ins>+revision        2
</ins><span class="cx"> license         Boost-1
</span><span class="cx"> categories      devel
</span><span class="cx"> platforms       darwin
</span><span class="lines">@@ -40,7 +40,9 @@
</span><span class="cx"> patchfiles      patch-tools_build_v2_engine_src_build.sh.diff \
</span><span class="cx">                 patch-tools_build_v2_engine_src_build.jam.diff \
</span><span class="cx">                 patch-libs-context-130308-0.diff \
</span><del>-                patch-bootstrap.sh.diff
</del><ins>+                patch-bootstrap.sh.diff \
+                patch-atomic.diff
+                # patch-atomic.diff can be removed once 1.55.1 or 1.56.0 is released.
</ins><span class="cx"> 
</span><span class="cx"> post-patch {
</span><span class="cx">     reinplace &quot;s|%%CONFIGURE.CC%%|${configure.cc}|g&quot; ${worksrcpath}/tools/build/v2/engine/build.sh
</span></span></pre></div>
<a id="trunkdportsdevelboostfilespatchatomicdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/boost/files/patch-atomic.diff (0 => 117769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/boost/files/patch-atomic.diff                                (rev 0)
+++ trunk/dports/devel/boost/files/patch-atomic.diff        2014-03-12 16:24:13 UTC (rev 117769)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+--- boost/atomic/detail/cas128strong.hpp
++++ boost/atomic/detail/cas128strong.hpp
+@@ -196,15 +196,17 @@ class base_atomic&lt;T, void, 16, Sign&gt;

+ public:
+     BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
+-    explicit base_atomic(value_type const&amp; v) BOOST_NOEXCEPT : v_(0)
++    explicit base_atomic(value_type const&amp; v) BOOST_NOEXCEPT
+     {
++        memset(&amp;v_, 0, sizeof(v_));
+         memcpy(&amp;v_, &amp;v, sizeof(value_type));
+     }

+     void
+     store(value_type const&amp; value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
+     {
+-        storage_type value_s = 0;
++        storage_type value_s;
++        memset(&amp;value_s, 0, sizeof(value_s));
+         memcpy(&amp;value_s, &amp;value, sizeof(value_type));
+         platform_fence_before_store(order);
+         platform_store128(value_s, &amp;v_);
+@@ -247,7 +249,9 @@ class base_atomic&lt;T, void, 16, Sign&gt;
+         memory_order success_order,
+         memory_order failure_order) volatile BOOST_NOEXCEPT
+     {
+-        storage_type expected_s = 0, desired_s = 0;
++        storage_type expected_s, desired_s;
++        memset(&amp;expected_s, 0, sizeof(expected_s));
++        memset(&amp;desired_s, 0, sizeof(desired_s));
+         memcpy(&amp;expected_s, &amp;expected, sizeof(value_type));
+         memcpy(&amp;desired_s, &amp;desired, sizeof(value_type));

+--- boost/atomic/detail/gcc-atomic.hpp
++++ boost/atomic/detail/gcc-atomic.hpp
+@@ -958,14 +958,16 @@ class base_atomic&lt;T, void, 16, Sign&gt;

+ public:
+     BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
+-    explicit base_atomic(value_type const&amp; v) BOOST_NOEXCEPT : v_(0)
++    explicit base_atomic(value_type const&amp; v) BOOST_NOEXCEPT
+     {
++        memset(&amp;v_, 0, sizeof(v_));
+         memcpy(&amp;v_, &amp;v, sizeof(value_type));
+     }

+     void store(value_type const&amp; v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
+     {
+-        storage_type tmp = 0;
++        storage_type tmp;
++        memset(&amp;tmp, 0, sizeof(tmp));
+         memcpy(&amp;tmp, &amp;v, sizeof(value_type));
+         __atomic_store_n(&amp;v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
+     }
+@@ -980,7 +982,8 @@ class base_atomic&lt;T, void, 16, Sign&gt;

+     value_type exchange(value_type const&amp; v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
+     {
+-        storage_type tmp = 0;
++        storage_type tmp;
++        memset(&amp;tmp, 0, sizeof(tmp));
+         memcpy(&amp;tmp, &amp;v, sizeof(value_type));
+         tmp = __atomic_exchange_n(&amp;v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
+         value_type res;
+@@ -994,7 +997,9 @@ class base_atomic&lt;T, void, 16, Sign&gt;
+         memory_order success_order,
+         memory_order failure_order) volatile BOOST_NOEXCEPT
+     {
+-        storage_type expected_s = 0, desired_s = 0;
++        storage_type expected_s, desired_s;
++        memset(&amp;expected_s, 0, sizeof(expected_s));
++        memset(&amp;desired_s, 0, sizeof(desired_s));
+         memcpy(&amp;expected_s, &amp;expected, sizeof(value_type));
+         memcpy(&amp;desired_s, &amp;desired, sizeof(value_type));
+         const bool success = __atomic_compare_exchange_n(&amp;v_, &amp;expected_s, desired_s, false,
+@@ -1010,7 +1015,9 @@ class base_atomic&lt;T, void, 16, Sign&gt;
+         memory_order success_order,
+         memory_order failure_order) volatile BOOST_NOEXCEPT
+     {
+-        storage_type expected_s = 0, desired_s = 0;
++        storage_type expected_s, desired_s;
++        memset(&amp;expected_s, 0, sizeof(expected_s));
++        memset(&amp;desired_s, 0, sizeof(desired_s));
+         memcpy(&amp;expected_s, &amp;expected, sizeof(value_type));
+         memcpy(&amp;desired_s, &amp;desired, sizeof(value_type));
+         const bool success = __atomic_compare_exchange_n(&amp;v_, &amp;expected_s, desired_s, true,
+-- 
</ins></span></pre>
</div>
</div>

</body>
</html>