<!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>[132960] 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/132960">132960</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-02-16 01:21:40 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-*: Correctly honor the -assertions variant (#46754)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm33Portfile">trunk/dports/lang/llvm-3.3/Portfile</a></li>
<li><a href="#trunkdportslangllvm34Portfile">trunk/dports/lang/llvm-3.4/Portfile</a></li>
<li><a href="#trunkdportslangllvm35Portfile">trunk/dports/lang/llvm-3.5/Portfile</a></li>
<li><a href="#trunkdportslangllvm36Portfile">trunk/dports/lang/llvm-3.6/Portfile</a></li>
<li><a href="#trunkdportslangllvm37Portfile">trunk/dports/lang/llvm-3.7/Portfile</a></li>
<li><a href="#trunkdportslangllvm37files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch">trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch</a></li>
<li><a href="#trunkdportslangllvm37files2002UpdateCheckArchestofallbackonIntelppcifldvpatch">trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch</a></li>
<li><a href="#trunkdportslangllvm37files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch">trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch</a></li>
<li><a href="#trunkdportslangllvm37files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch">trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm33Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.3/Portfile (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.3/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><span class="cx"> set llvm_version 3.3
</span><del>-revision 4
</del><ins>+revision 7
</ins><span class="cx"> name llvm-${llvm_version}
</span><del>-subport clang-${llvm_version} { revision 6 }
</del><ins>+subport clang-${llvm_version} {}
</ins><span class="cx"> set suffix mp-${llvm_version}
</span><span class="cx"> set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
</span><span class="cx"> dist_subdir llvm
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
</span><span class="cx"> --enable-optimized --disable-profiling --enable-pic \
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><del>- --prefix="${sub_prefix}"
</del><ins>+ --prefix="${sub_prefix}" --disable-assertions
</ins><span class="cx">
</span><span class="cx"> if {${subport} == "llvm-${llvm_version}"} {
</span><span class="cx"> select.group llvm
</span><span class="lines">@@ -150,6 +150,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
</span><ins>+ configure.args-delete --disable-assertions
</ins><span class="cx"> configure.args-append --enable-assertions
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/Portfile (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> set llvm_version 3.4
</span><span class="cx"> set llvm_version_no_dot 34
</span><span class="cx"> name llvm-${llvm_version}
</span><del>-revision 1
-subport clang-${llvm_version} { revision 5 }
</del><ins>+revision 6
+subport clang-${llvm_version} {}
</ins><span class="cx"> set suffix mp-${llvm_version}
</span><span class="cx"> set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
</span><span class="cx"> dist_subdir llvm
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
</span><span class="cx"> --enable-optimized --disable-profiling --enable-pic \
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><del>- --prefix="${sub_prefix}"
</del><ins>+ --prefix="${sub_prefix}" --disable-assertions
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq "llvm-${llvm_version}"} {
</span><span class="cx"> select.group llvm
</span><span class="lines">@@ -196,6 +196,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
</span><ins>+ configure.args-delete --disable-assertions
</ins><span class="cx"> configure.args-append --enable-assertions
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/Portfile (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> set llvm_version 3.5
</span><span class="cx"> set llvm_version_no_dot 35
</span><span class="cx"> name llvm-${llvm_version}
</span><del>-revision 1
-subport clang-${llvm_version} { revision 2 }
</del><ins>+revision 3
+subport clang-${llvm_version} {}
</ins><span class="cx"> set suffix mp-${llvm_version}
</span><span class="cx"> set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
</span><span class="cx"> dist_subdir llvm
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
</span><span class="cx"> --enable-optimized --disable-profiling --enable-pic \
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><del>- --prefix="${sub_prefix}"
</del><ins>+ --prefix="${sub_prefix}" --disable-assertions
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq "llvm-${llvm_version}"} {
</span><span class="cx"> select.group llvm
</span><span class="lines">@@ -227,6 +227,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
</span><ins>+ configure.args-delete --disable-assertions
</ins><span class="cx"> configure.args-append --enable-assertions
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm36Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/Portfile (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fetch.type svn
</span><del>-svn.revision 226372
</del><ins>+svn.revision 229298
</ins><span class="cx">
</span><span class="cx"> set compiler_rt_rev ${svn.revision}
</span><span class="cx"> set libcxx_rev ${svn.revision}
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
</span><span class="cx"> --enable-optimized --disable-profiling --enable-pic \
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><del>- --prefix="${sub_prefix}"
</del><ins>+ --prefix="${sub_prefix}" --disable-assertions
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq "llvm-${llvm_version}"} {
</span><span class="cx"> select.group llvm
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
</span><ins>+ configure.args-delete --disable-assertions
</ins><span class="cx"> configure.args-append --enable-assertions
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/Portfile (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fetch.type svn
</span><del>-svn.revision 226372
</del><ins>+svn.revision 229298
</ins><span class="cx">
</span><span class="cx"> set compiler_rt_rev ${svn.revision}
</span><span class="cx"> set libcxx_rev ${svn.revision}
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
</span><span class="cx"> --enable-optimized --disable-profiling --enable-pic \
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><del>- --prefix="${sub_prefix}"
</del><ins>+ --prefix="${sub_prefix}" --disable-assertions
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq "llvm-${llvm_version}"} {
</span><span class="cx"> select.group llvm
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
</span><ins>+ configure.args-delete --disable-assertions
</ins><span class="cx"> configure.args-append --enable-assertions
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 1a76dc937816603c8da46b0a16985f28e3a3b9dd Mon Sep 17 00:00:00 2001
</del><ins>+From 6f543c369c868da8eabc97b27b64ddaaf7fa7a00 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Mon, 15 Apr 2013 22:38:18 -0700
</span><span class="cx"> Subject: [PATCH 2001/2004] MacPorts Only: Comment out SL cctools workaround
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> 1 file changed, 6 insertions(+), 6 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><del>-index f4f548e..6f62170 100644
</del><ins>+index 4f71c0b..cc553ae 100644
</ins><span class="cx"> --- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><span class="cx"> +++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><del>-@@ -122,12 +122,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(O
</del><ins>+@@ -126,12 +126,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(O
</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">@@ -32,5 +32,5 @@
</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><span class="cx"> --
</span><del>-2.2.2
</del><ins>+2.3.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2002UpdateCheckArchestofallbackonIntelppcifldvpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From be3909d280cae05c93c520bfb1e7a8f0ed5a11af Mon Sep 17 00:00:00 2001
</del><ins>+From 23ae20f935fb745104ff31cc280ed4bdd059b655 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 10 Jan 2015 03:34:51 -0800
</span><span class="cx"> Subject: [PATCH 2002/2004] Update CheckArches to fallback on Intel/ppc if ld
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> 1 file changed, 2 insertions(+)
</span><span class="cx">
</span><span class="cx"> diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><del>-index 6f62170..0120547 100644
</del><ins>+index cc553ae..08e97f5 100644
</ins><span class="cx"> --- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><span class="cx"> +++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><span class="cx"> @@ -25,6 +25,8 @@ CheckArches = \
</span><span class="lines">@@ -27,5 +27,5 @@
</span><span class="cx"> printf 1>&2 \
</span><span class="cx"> "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
</span><span class="cx"> --
</span><del>-2.2.2
</del><ins>+2.3.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 9de48c64a81a3cd9bee512fce88b81bcc7b38bb8 Mon Sep 17 00:00:00 2001
</del><ins>+From 0d87693a90dbd828868f125bbc6f496659e4ce14 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 17:45:27 -0800
</span><span class="cx"> Subject: [PATCH 2003/2004] Fall back on xcodebuild -sdk when xcrun --sdk is
</span><span class="lines">@@ -10,20 +10,20 @@
</span><span class="cx"> 1 file changed, 4 insertions(+)
</span><span class="cx">
</span><span class="cx"> diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><del>-index 0120547..ac8de4a 100644
</del><ins>+index 08e97f5..d99081b 100644
</ins><span class="cx"> --- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><span class="cx"> +++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><del>-@@ -49,6 +49,10 @@ XCRun = \
- XCRunSdkPath = \
- $(shell \
- result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
-+ if [ "$$?" != "0" ]; then \
-+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
-+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
-+ fi; \
- if [ "$$?" != "0" ]; then result=""; fi; \
</del><ins>+@@ -52,6 +52,10 @@ XCRunSdkPath = \
+ result=`xcrun --sdk $(1).internal --show-sdk-path 2> /dev/null`; \
+ if [ "$$?" != "0" ]; then \
+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
+ if [ "$$?" != "0" ]; then result=""; fi; \
+ fi; \
</ins><span class="cx"> echo $$result)
</span><del>- ###
</del><span class="cx"> --
</span><del>-2.2.2
</del><ins>+2.3.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch (132959 => 132960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-02-16 09:21:40 UTC (rev 132960)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 1fe76a2b12f4837c49237cdca6803e5f43e00f7c Mon Sep 17 00:00:00 2001
</del><ins>+From f0e6107c4e73d8da46ffe0ed530bfc0d48f69e06 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 19:55:19 -0800
</span><span class="cx"> Subject: [PATCH 2004/2004] On darwin, build ppc slices of the compiler runtime
</span><span class="lines">@@ -10,10 +10,10 @@
</span><span class="cx"> 1 file changed, 6 insertions(+), 6 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><del>-index ac8de4a..6936031 100644
</del><ins>+index d99081b..09c9a86 100644
</ins><span class="cx"> --- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><span class="cx"> +++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</span><del>-@@ -79,10 +79,10 @@ Configs += eprintf
</del><ins>+@@ -83,10 +83,10 @@ Configs += eprintf
</ins><span class="cx"> UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK))
</span><span class="cx">
</span><span class="cx"> # Configuration for targeting 10.4. We need a few functions missing from
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> # Configuration for targeting iOS for a couple of functions that didn't
</span><span class="cx"> # make it into libSystem.
</span><del>-@@ -93,11 +93,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK))
</del><ins>+@@ -97,11 +97,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK))
</ins><span class="cx"> # Configuration for targeting OSX. These functions may not be in libSystem
</span><span class="cx"> # so we should provide our own.
</span><span class="cx"> Configs += osx
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> UniversalArchs.cc_kext += $(call CheckArches,armv7 arm64,cc_kext,$(IOS_SDK))
</span><span class="cx">
</span><span class="cx"> # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used
</span><del>-@@ -109,7 +109,7 @@ UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
</del><ins>+@@ -113,7 +113,7 @@ UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
</ins><span class="cx">
</span><span class="cx"> # Configurations which define the profiling support functions.
</span><span class="cx"> Configs += profile_osx
</span><span class="lines">@@ -51,5 +51,5 @@
</span><span class="cx"> UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
</span><span class="cx"> UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
</span><span class="cx"> --
</span><del>-2.2.2
</del><ins>+2.3.0
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>