<!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>[117562] trunk/dports/lang/llvm-3.5</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/117562">117562</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-03-03 12:34:17 -0800 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>clang-3.5: Snow Leopard build fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm35Portfile">trunk/dports/lang/llvm-3.5/Portfile</a></li>
<li><a href="#trunkdportslangllvm35files0001CommentoutSLcctoolsworkaroundpatch">trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/Portfile (117561 => 117562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile 2014-03-03 19:59:02 UTC (rev 117561)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-03-03 20:34:17 UTC (rev 117562)
</span><span class="lines">@@ -239,6 +239,10 @@
</span><span class="cx">
</span><span class="cx"> reinplace {s/VERBOSE := 0/VERBOSE := 1/} ${worksrcpath}/projects/compiler-rt/make/config.mk
</span><span class="cx"> }
</span><ins>+
+ reinplace "s|@@PREFIX@@|${prefix}|g" \
+ ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk \
+ ${worksrcpath}/projects/compiler-rt/make/platform/clang_macho_embedded.mk
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm35files0001CommentoutSLcctoolsworkaroundpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch (117561 => 117562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch 2014-03-03 19:59:02 UTC (rev 117561)
+++ trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch 2014-03-03 20:34:17 UTC (rev 117562)
</span><span class="lines">@@ -1,17 +1,22 @@
</span><del>-From 5d32457c53bb0ae8abdafeceb1b622a7b7934de2 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH] Comment out SL cctools workaround
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- make/platform/clang_darwin.mk | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
-index a5e22e6..6a4e956 100644
</del><span class="cx"> --- a/projects/compiler-rt/make/platform/clang_darwin.mk
</span><span class="cx"> +++ a/projects/compiler-rt/make/platform/clang_darwin.mk
</span><ins>+@@ -47,11 +47,11 @@ XCRunSdkPath = \
+
+ CC := $(call XCRun,clang)
+ LD := $(shell $(CC) -print-prog-name=ld)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ Configs :=
+ UniversalArchs :=
</ins><span class="cx"> @@ -83,12 +83,12 @@ UniversalArchs.ubsan_osx := $(call Check
</span><span class="cx"> # object files. If we are on that platform, strip out all ARM archs. We still
</span><span class="cx"> # build the libraries themselves so that Clang can find them where it expects
</span><span class="lines">@@ -31,6 +36,22 @@
</span><span class="cx">
</span><span class="cx"> # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
</span><span class="cx"> # are intended to support and limit what we try to build to that.
</span><del>---
-1.8.2.1
-
</del><ins>+--- a/projects/compiler-rt/make/platform/clang_macho_embedded.mk 2014-03-03 10:11:37.000000000 -0800
++++ a/projects/compiler-rt/make/platform/clang_macho_embedded.mk 2014-03-03 12:08:37.000000000 -0800
+@@ -33,11 +33,11 @@ XCRun = \
+ ###
+
+ CC := $(call XCRun,clang)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ Configs :=
+ UniversalArchs :=
</ins></span></pre>
</div>
</div>
</body>
</html>