<!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>[129358] trunk/dports/lang</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/129358">129358</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-12-10 15:41:40 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>{clang,llvm}-3.{4,5,6}: Refresh patches
(Jeremy signed off via email.)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm34Portfile">trunk/dports/lang/llvm-3.4/Portfile</a></li>
<li><a href="#trunkdportslangllvm34files0001CommentoutSLcctoolsworkaroundpatch">trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch</a></li>
<li><a href="#trunkdportslangllvm34filesclangformatpatch">trunk/dports/lang/llvm-3.4/files/clang-format.patch</a></li>
<li><a href="#trunkdportslangllvm34filesleopardnoasanpatch">trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch</a></li>
<li><a href="#trunkdportslangllvm34filesscanbuildPR35006patch">trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch</a></li>
<li><a href="#trunkdportslangllvm34filestigerlibclangpatch">trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch</a></li>
<li><a href="#trunkdportslangllvm35files0001CommentoutSLcctoolsworkaroundpatch">trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch</a></li>
<li><a href="#trunkdportslangllvm35filesclangformatpatch">trunk/dports/lang/llvm-3.5/files/clang-format.patch</a></li>
<li><a href="#trunkdportslangllvm35filesscanbuildPR35006patch">trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/Portfile (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/Portfile 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.4/Portfile 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -107,13 +107,15 @@
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><span class="cx"> if {${subport} eq "clang-${llvm_version}"} {
</span><del>- patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
- 0001-Comment-out-SL-cctools-workaround.patch \
- 0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch \
- clang-format.patch \
- clang-modernize.patch \
- yosemite-deployment-target.patch \
- snowleopard-cmath.patch
</del><ins>+ patchfiles-append tiger-shlib-clang.patch \
+ tiger-libclang.patch \
+ scan-build-PR-35006.patch \
+ 0001-Comment-out-SL-cctools-workaround.patch \
+ 0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch \
+ clang-format.patch \
+ clang-modernize.patch \
+ yosemite-deployment-target.patch \
+ snowleopard-cmath.patch
</ins><span class="cx">
</span><span class="cx"> build.target clang-only
</span><span class="cx"> destroot.target install-clang
</span></span></pre></div>
<a id="trunkdportslangllvm34files0001CommentoutSLcctoolsworkaroundpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><del>---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ a/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -47,10 +47,10 @@ XCRunSdkPath = \
</del><ins>+Index: llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk
+===================================================================
+--- llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin.mk
++++ llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -38,11 +38,11 @@ XCRunSdkPath = \
+ ###
</ins><span class="cx">
</span><span class="cx"> CC := $(call XCRun,clang)
</span><span class="cx"> -AR := $(call XCRun,ar)
</span><span class="lines">@@ -16,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> Configs :=
</span><span class="cx"> UniversalArchs :=
</span><del>-@@ -83,12 +83,12 @@ UniversalArchs.ubsan_osx := $(call Check
</del><ins>+@@ -101,12 +101,12 @@ UniversalArchs.ubsan_osx := $(call Check
</ins><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="cx"> # them, even though they might not have an expected slice.
</span><span class="lines">@@ -35,9 +38,11 @@
</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>---- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk 2014-03-03 10:11:37.000000000 -0800
-+++ a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk 2014-03-03 12:08:37.000000000 -0800
-@@ -33,11 +33,11 @@ XCRun = \
</del><ins>+Index: llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
+===================================================================
+--- llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
++++ llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
+@@ -15,11 +15,11 @@ XCRun = \
</ins><span class="cx"> ###
</span><span class="cx">
</span><span class="cx"> CC := $(call XCRun,clang)
</span></span></pre></div>
<a id="trunkdportslangllvm34filesclangformatpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/clang-format.patch (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/files/clang-format.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.4/files/clang-format.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- a/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2012-04-20 10:09:40.000000000 -0700
-@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -15,7 +15,7 @@ tell application "BBEdit"
</ins><span class="cx"> end tell
</span><span class="cx">
</span><span class="cx"> set filePath to urlToPOSIXPath(fileURL)
</span><span class="lines">@@ -9,9 +11,11 @@
</span><span class="cx">
</span><span class="cx"> tell application "BBEdit"
</span><span class="cx"> -- "set contents of text document 1 to newContents" scrolls to the bottom while
</span><del>---- a/tools/clang/tools/clang-format/clang-format-diff.py 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-diff.py 2012-04-20 10:09:40.000000000 -0700
-@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-diff.py
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format-diff.py
++++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -31,7 +31,7 @@ import sys
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="lines">@@ -20,11 +24,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main():
</span><ins>+Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.el
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format.el
++++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.el
+@@ -13,7 +13,7 @@
</ins><span class="cx">
</span><del>---- a/tools/clang/tools/clang-format/clang-format.el 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format.el 2012-04-20 10:09:40.000000000 -0700
-@@ -13,7 +13,7 @@ ifeq ($(HOST_OS),Darwin)
-
</del><span class="cx"> ;; *Location of the clang-format binary. If it is on your PATH, a full path name
</span><span class="cx"> ;; need not be specified.
</span><span class="cx"> -(defvar clang-format-binary "clang-format")
</span><span class="lines">@@ -32,9 +37,11 @@
</span><span class="cx">
</span><span class="cx"> (defun clang-format-region ()
</span><span class="cx"> "Use clang-format to format the currently active region."
</span><del>---- a/tools/clang/tools/clang-format/clang-format.py 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format.py 2012-04-20 10:09:40.000000000 -0700
-@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.py
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format.py
++++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.py
+@@ -24,7 +24,7 @@ import sys
</ins><span class="cx"> import vim
</span><span class="cx">
</span><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="lines">@@ -43,10 +50,11 @@
</span><span class="cx">
</span><span class="cx"> # Change this to format according to other formatting styles. See the output of
</span><span class="cx"> # 'clang-format --help' for a list of supported styles. The default looks for
</span><del>-
---- a/tools/clang/tools/clang-format/clang-format-sublime.py2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-sublime.py 2012-04-20 10:09:40.000000000 -0700
-@@ -18,7 +18,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-sublime.py
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format-sublime.py
++++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
</ins><span class="cx"> import subprocess
</span><span class="cx">
</span><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="lines">@@ -55,10 +63,11 @@
</span><span class="cx">
</span><span class="cx"> # Change this to format according to other formatting styles. See the output of
</span><span class="cx"> # 'clang-format --help' for a list of supported styles. The default looks for
</span><del>---- a/Makefile 2013-10-02 08:42:23.000000000 -0700
-+++ b/Makefile 2013-10-24 10:57:33.000000000 -0700
-@@ -70,8 +70,9 @@ ifeq ($(MAKECMDGOALS),install-clang)
- DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
</del><ins>+Index: llvm-3.4.2.src/Makefile
+===================================================================
+--- llvm-3.4.2.src.orig/Makefile
++++ llvm-3.4.2.src/Makefile
+@@ -71,7 +71,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
</ins><span class="cx"> tools/clang/tools/libclang \
</span><span class="cx"> tools/clang/tools/c-index-test \
</span><span class="cx"> tools/clang/runtime tools/clang/docs \
</span></span></pre></div>
<a id="trunkdportslangllvm34filesleopardnoasanpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><del>---- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig 2013-11-22 06:31:50.000000000 -0800
-+++ a/projects/compiler-rt/make/platform/clang_darwin.mk 2014-04-17 22:17:52.000000000 -0700
</del><ins>+Index: llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk
+===================================================================
+--- llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin.mk
++++ llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk
</ins><span class="cx"> @@ -85,8 +85,8 @@ Configs += profile_ios
</span><span class="cx"> UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
</span><span class="cx">
</span><span class="lines">@@ -22,9 +24,11 @@
</span><span class="cx">
</span><span class="cx"> # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
</span><span class="cx"> # object files. If we are on that platform, strip out all ARM archs. We still
</span><del>---- a/tools/clang/runtime/compiler-rt/Makefile.orig 2013-11-15 15:12:44.000000000 -0800
-+++ a/tools/clang/runtime/compiler-rt/Makefile 2014-04-17 22:18:44.000000000 -0700
-@@ -81,9 +81,7 @@ ifeq ($(OS),Darwin)
</del><ins>+Index: llvm-3.4.2.src/tools/clang/runtime/compiler-rt/Makefile
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/runtime/compiler-rt/Makefile
++++ llvm-3.4.2.src/tools/clang/runtime/compiler-rt/Makefile
+@@ -82,9 +82,7 @@ ifeq ($(OS),Darwin)
</ins><span class="cx"> RuntimeDirs += darwin darwin_embedded
</span><span class="cx"> RuntimeLibrary.darwin.Configs := \
</span><span class="cx"> eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
</span></span></pre></div>
<a id="trunkdportslangllvm34filesscanbuildPR35006patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- a/tools/clang/tools/scan-build/scan-build.orig 2012-07-12 09:47:19.000000000 -0700
-+++ b/tools/clang/tools/scan-build/scan-build 2012-07-12 09:49:15.000000000 -0700
-@@ -1399,6 +1399,8 @@ if (defined $OutputFormat) {
</del><ins>+Index: llvm-3.4.2.src/tools/clang/tools/scan-build/scan-build
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/scan-build/scan-build
++++ llvm-3.4.2.src/tools/clang/tools/scan-build/scan-build
+@@ -1677,6 +1677,8 @@ if (defined $OutputFormat) {
</ins><span class="cx"> Diag "Analysis run complete.\n";
</span><span class="cx"> Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
</span><span class="cx"> my $ScanView = Cwd::realpath("$RealBin/scan-view");
</span></span></pre></div>
<a id="trunkdportslangllvm34filestigerlibclangpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,8 +1,10 @@
</span><del>---- a/tools/clang/tools/libclang/CIndex.cpp.orig 2012-04-01 22:38:40.000000000 -0700
-+++ b/tools/clang/tools/libclang/CIndex.cpp 2012-04-01 22:39:17.000000000 -0700
-@@ -5754,7 +5754,7 @@ void SetSafetyThreadStackSize(unsigned V
</del><ins>+Index: llvm-3.4.2.src/tools/clang/tools/libclang/CIndex.cpp
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/libclang/CIndex.cpp
++++ llvm-3.4.2.src/tools/clang/tools/libclang/CIndex.cpp
+@@ -6518,7 +6518,7 @@ void clang::setThreadBackgroundPriority(
+ return;
</ins><span class="cx">
</span><del>- void clang::setThreadBackgroundPriority() {
</del><span class="cx"> // FIXME: Move to llvm/Support and make it cross-platform.
</span><span class="cx"> -#ifdef __APPLE__
</span><span class="cx"> +#if defined(__APPLE__) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
</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 (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><del>---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ a/projects/compiler-rt/make/platform/clang_darwin.mk
</del><ins>+Index: llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_darwin.mk
+===================================================================
+--- llvm-3.5.0.src.orig/projects/compiler-rt/make/platform/clang_darwin.mk
++++ llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_darwin.mk
</ins><span class="cx"> @@ -47,11 +47,11 @@ XCRunSdkPath = \
</span><span class="cx">
</span><span class="cx"> CC := $(call XCRun,clang)
</span><span class="lines">@@ -17,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> Configs :=
</span><span class="cx"> UniversalArchs :=
</span><del>-@@ -83,12 +83,12 @@ UniversalArchs.ubsan_osx := $(call Check
</del><ins>+@@ -110,12 +110,12 @@ UniversalArchs.ubsan_osx := $(call Check
</ins><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="cx"> # them, even though they might not have an expected slice.
</span><span class="lines">@@ -36,8 +38,10 @@
</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>---- 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
</del><ins>+Index: llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+===================================================================
+--- llvm-3.5.0.src.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
++++ llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_macho_embedded.mk
</ins><span class="cx"> @@ -33,11 +33,11 @@ XCRun = \
</span><span class="cx"> ###
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm35filesclangformatpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/files/clang-format.patch (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/files/clang-format.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.5/files/clang-format.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- a/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2012-04-20 10:09:40.000000000 -0700
-@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+===================================================================
+--- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -15,7 +15,7 @@ tell application "BBEdit"
</ins><span class="cx"> end tell
</span><span class="cx">
</span><span class="cx"> set filePath to urlToPOSIXPath(fileURL)
</span><span class="lines">@@ -9,9 +11,11 @@
</span><span class="cx">
</span><span class="cx"> tell application "BBEdit"
</span><span class="cx"> -- "set contents of text document 1 to newContents" scrolls to the bottom while
</span><del>---- a/tools/clang/tools/clang-format/clang-format-diff.py 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-diff.py 2012-04-20 10:09:40.000000000 -0700
-@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-diff.py
+===================================================================
+--- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format-diff.py
++++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -32,7 +32,7 @@ import sys
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="lines">@@ -20,11 +24,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main():
</span><ins>+Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.el
+===================================================================
+--- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format.el
++++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.el
+@@ -13,7 +13,7 @@
</ins><span class="cx">
</span><del>---- a/tools/clang/tools/clang-format/clang-format.el 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format.el 2012-04-20 10:09:40.000000000 -0700
-@@ -13,7 +13,7 @@ ifeq ($(HOST_OS),Darwin)
-
</del><span class="cx"> ;; *Location of the clang-format binary. If it is on your PATH, a full path name
</span><span class="cx"> ;; need not be specified.
</span><span class="cx"> -(defvar clang-format-binary "clang-format")
</span><span class="lines">@@ -32,9 +37,11 @@
</span><span class="cx">
</span><span class="cx"> (defun clang-format-region ()
</span><span class="cx"> "Use clang-format to format the currently active region."
</span><del>---- a/tools/clang/tools/clang-format/clang-format.py 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format.py 2012-04-20 10:09:40.000000000 -0700
-@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.py
+===================================================================
+--- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format.py
++++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.py
+@@ -24,7 +24,7 @@ import sys
</ins><span class="cx"> import vim
</span><span class="cx">
</span><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="lines">@@ -43,10 +50,11 @@
</span><span class="cx">
</span><span class="cx"> # Change this to format according to other formatting styles. See the output of
</span><span class="cx"> # 'clang-format --help' for a list of supported styles. The default looks for
</span><del>-
---- a/tools/clang/tools/clang-format/clang-format-sublime.py2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-sublime.py 2012-04-20 10:09:40.000000000 -0700
-@@ -18,7 +18,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-sublime.py
+===================================================================
+--- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format-sublime.py
++++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
</ins><span class="cx"> import subprocess
</span><span class="cx">
</span><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="lines">@@ -55,10 +63,11 @@
</span><span class="cx">
</span><span class="cx"> # Change this to format according to other formatting styles. See the output of
</span><span class="cx"> # 'clang-format --help' for a list of supported styles. The default looks for
</span><del>---- a/Makefile 2013-10-02 08:42:23.000000000 -0700
-+++ b/Makefile 2013-10-24 10:57:33.000000000 -0700
-@@ -70,8 +70,9 @@ ifeq ($(MAKECMDGOALS),install-clang)
- DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
</del><ins>+Index: llvm-3.5.0.src/Makefile
+===================================================================
+--- llvm-3.5.0.src.orig/Makefile
++++ llvm-3.5.0.src/Makefile
+@@ -71,7 +71,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
</ins><span class="cx"> tools/clang/tools/libclang \
</span><span class="cx"> tools/clang/tools/c-index-test \
</span><span class="cx"> tools/clang/runtime tools/clang/docs \
</span></span></pre></div>
<a id="trunkdportslangllvm35filesscanbuildPR35006patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch (129357 => 129358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch 2014-12-10 23:38:21 UTC (rev 129357)
+++ trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch 2014-12-10 23:41:40 UTC (rev 129358)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- a/tools/clang/tools/scan-build/scan-build.orig 2012-07-12 09:47:19.000000000 -0700
-+++ b/tools/clang/tools/scan-build/scan-build 2012-07-12 09:49:15.000000000 -0700
-@@ -1399,6 +1399,8 @@ if (defined $OutputFormat) {
</del><ins>+Index: llvm-3.5.0.src/tools/clang/tools/scan-build/scan-build
+===================================================================
+--- llvm-3.5.0.src.orig/tools/clang/tools/scan-build/scan-build
++++ llvm-3.5.0.src/tools/clang/tools/scan-build/scan-build
+@@ -1727,6 +1727,8 @@ if (defined $OutputFormat) {
</ins><span class="cx"> Diag "Analysis run complete.\n";
</span><span class="cx"> Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
</span><span class="cx"> my $ScanView = Cwd::realpath("$RealBin/scan-view");
</span></span></pre>
</div>
</div>
</body>
</html>