<!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>[115552] trunk/dports/devel/gmake</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/115552">115552</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-04 12:06:01 -0800 (Sat, 04 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>gmake: Fix parallel builds when using gmake</pre>

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

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/gmake/files/</li>
<li><a href="#trunkdportsdevelgmakefilesmakeintermediateparallelbugpatch">trunk/dports/devel/gmake/files/make-intermediate-parallel-bug.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgmakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gmake/Portfile (115551 => 115552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gmake/Portfile        2014-01-04 19:35:06 UTC (rev 115551)
+++ trunk/dports/devel/gmake/Portfile        2014-01-04 20:06:01 UTC (rev 115552)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> name            gmake
</span><span class="cx"> version         3.82
</span><ins>+revision        1
</ins><span class="cx"> categories      devel
</span><span class="cx"> maintainers     nomaintainer
</span><span class="cx"> description     GNU Make
</span><span class="lines">@@ -30,5 +31,9 @@
</span><span class="cx">                 --mandir=${prefix}/share/man
</span><span class="cx"> depends_lib     port:gettext port:libiconv
</span><span class="cx"> 
</span><ins>+# https://bugs.webkit.org/show_bug.cgi?id=126471
+# https://savannah.gnu.org/bugs/?30653
+patchfiles      make-intermediate-parallel-bug.patch
+
</ins><span class="cx"> test.run        yes
</span><span class="cx"> test.target     check
</span></span></pre></div>
<a id="trunkdportsdevelgmakefilesmakeintermediateparallelbugpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/gmake/files/make-intermediate-parallel-bug.patch (0 => 115552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gmake/files/make-intermediate-parallel-bug.patch                                (rev 0)
+++ trunk/dports/devel/gmake/files/make-intermediate-parallel-bug.patch        2014-01-04 20:06:01 UTC (rev 115552)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+Index: remake.c
+===================================================================
+RCS file: /sources/make/make/remake.c,v
+retrieving revision 1.147
+diff -u -r1.147 remake.c
+--- remake.c        13 Jul 2010 01:20:42 -0000        1.147
++++ remake.c        5 Aug 2010 01:02:18 -0000
+@@ -614,6 +614,12 @@
+                 d-&gt;file-&gt;dontcare = file-&gt;dontcare;
+               }

++            /* We may have already encountered this file earlier in the same
++             * pass before we knew we'd be updating this target. In that 
++             * case calling update_file now would result in the file being 
++             * inappropriately pruned so we toggle the considered bit back 
++             * off first. */
++            d-&gt;file-&gt;considered = !considered;

+             dep_status |= update_file (d-&gt;file, depth);

+Index: tests/scripts/features/parallelism
+===================================================================
+RCS file: /sources/make/make/tests/scripts/features/parallelism,v
+retrieving revision 1.16
+diff -u -r1.16 parallelism
+--- tests/scripts/features/parallelism        5 Jul 2010 18:32:03 -0000        1.16
++++ tests/scripts/features/parallelism        5 Aug 2010 01:02:18 -0000
+@@ -164,6 +164,27 @@

+ rmfiles('inc.mk');

++utouch(-15, 'file2');
++utouch(-10, 'file4');
++utouch(-5,  'file1');
++
++run_make_test(q!
++.INTERMEDIATE: file3
++
++file4: file3
++        @mv -f $&lt; $@
++
++file3: file2
++        @touch $@
++
++file2: file1
++        @touch $@
++!,
++              '--no-print-directory -j2');
++
++rmfiles('file1', 'file2', 'file3', 'file4');
++
++
+ if ($all_tests) {
+     # Implicit files aren't properly recreated during parallel builds
+     # Savannah bug #26864
</ins></span></pre>
</div>
</div>

</body>
</html>