<!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>[141235] trunk/dports/lang/llvm-gcc42</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/141235">141235</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-10-13 00:10:18 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-gcc42: Fix build failure with clang (#49241)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvmgcc42Portfile">trunk/dports/lang/llvm-gcc42/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvmgcc42filesclangoptimizationpatch">trunk/dports/lang/llvm-gcc42/files/clang-optimization.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvmgcc42Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-gcc42/Portfile (141234 => 141235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-gcc42/Portfile        2015-10-13 06:57:08 UTC (rev 141234)
+++ trunk/dports/lang/llvm-gcc42/Portfile        2015-10-13 07:10:18 UTC (rev 141235)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name llvm-gcc42
</span><span class="cx"> version 2336.11
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> set gcc_version 4.2.1
</span><span class="cx"> categories lang
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -54,10 +54,6 @@
</span><span class="cx"> set objroot ${workpath}/objroot
</span><span class="cx"> set symroot ${workpath}/symroot
</span><span class="cx">
</span><del>-# https://trac.macports.org/ticket/42899
-# TODO: Fix it to build with newer clang
-compiler.blacklist-append {clang > 503} macports-clang-3.4 macports-clang-3.5 macports-clang-3.6 macports-clang-3.7
-
</del><span class="cx"> # Don't compile with self
</span><span class="cx"> compiler.blacklist-append macports-llvm-gcc-4.2
</span><span class="cx">
</span><span class="lines">@@ -82,6 +78,10 @@
</span><span class="cx">         autogen.patch \
</span><span class="cx">         fixincludes.patch
</span><span class="cx">
</span><ins>+if {[string match *clang* ${configure.cc}]} {
+ patchfiles-append clang-optimization.patch
+}
+
</ins><span class="cx"> post-extract {
</span><span class="cx"> xinstall -W ${filespath} build_gcc ${worksrcpath}
</span><span class="cx"> }
</span><span class="lines">@@ -130,6 +130,13 @@
</span><span class="cx"> if {[string match "*clang*" ${configure.compiler}]} {
</span><span class="cx"> reinplace "s:--enable-werror : :" ${worksrcpath}/build_gcc
</span><span class="cx"> }
</span><ins>+
+ # ltmain.sh notes 'On all known operating systems, these are identical', and -module has gone
+ # away with Apple's clang-3.4
+ if {[string match *clang* ${configure.cc}]} {
+ reinplace "s:module:export_dynamic:" ${worksrcpath}/llvmCore/Makefile.rules
+ reinplace "s:-no-undefined::" ${worksrcpath}/llvmCore/tools/lto/Makefile
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> compiler.cpath /usr/include
</span></span></pre></div>
<a id="trunkdportslangllvmgcc42filesclangoptimizationpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-gcc42/files/clang-optimization.patch (0 => 141235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-gcc42/files/clang-optimization.patch         (rev 0)
+++ trunk/dports/lang/llvm-gcc42/files/clang-optimization.patch        2015-10-13 07:10:18 UTC (rev 141235)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+--- llvmCore/lib/CodeGen/MachineSSAUpdater.cpp.orig        2015-10-12 19:33:17.000000000 -0400
++++ llvmCore/lib/CodeGen/MachineSSAUpdater.cpp        2015-10-12 19:34:31.000000000 -0400
+@@ -38,7 +38,7 @@
+ return *static_cast<IncomingPredInfoTy*>(IPI);
+ }
+
+-
++#pragma clang optimize off
+ MachineSSAUpdater::MachineSSAUpdater(MachineFunction &MF,
+ SmallVectorImpl<MachineInstr*> *NewPHI)
+ : AV(0), IPI(0), InsertedPHIs(NewPHI) {
+@@ -50,6 +50,7 @@
+ delete &getAvailableVals(AV);
+ delete &getIncomingPredInfo(IPI);
+ }
++#pragma clang optimize on
+
+ /// Initialize - Reset this object to get ready for a new set of SSA
+ /// updates. ProtoValue is the value used to name PHI nodes.
+--- llvmCore/lib/Transforms/Utils/SSAUpdater.cpp.orig        2015-10-12 19:34:50.000000000 -0400
++++ llvmCore/lib/Transforms/Utils/SSAUpdater.cpp        2015-10-12 19:35:24.000000000 -0400
+@@ -32,7 +32,7 @@
+ return *static_cast<IncomingPredInfoTy*>(IPI);
+ }
+
+-
++#pragma clang optimize off
+ SSAUpdater::SSAUpdater(SmallVectorImpl<PHINode*> *NewPHI)
+ : AV(0), PrototypeValue(0), IPI(0), InsertedPHIs(NewPHI) {}
+
+@@ -40,6 +40,7 @@
+ delete &getAvailableVals(AV);
+ delete &getIncomingPredInfo(IPI);
+ }
++#pragma clang optimize on
+
+ /// Initialize - Reset this object to get ready for a new set of SSA
+ /// updates. ProtoValue is the value used to name PHI nodes.
</ins></span></pre>
</div>
</div>
</body>
</html>