<!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>[131355] 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/131355">131355</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-10 03:56:47 -0800 (Sat, 10 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>clang-3.[56]: Steps towards getting working on Leopard, but not there yet</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm35files0001UpdateCheckArchestofallbackonIntelppcifldvpatch">trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch</a></li>
<li><a href="#trunkdportslangllvm36files0001UpdateCheckArchestofallbackonIntelppcifldvpatch">trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.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 (131354 => 131355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile 2015-01-10 11:38:40 UTC (rev 131354)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-01-10 11:56:47 UTC (rev 131355)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx"> 0001-PR21536-Fix-a-corner-case-where-we-d-get-confused-by.patch \
</span><span class="cx"> 0002-PR19372-Keep-checking-template-arguments-after-we-se.patch \
</span><span class="cx"> 0001-Comment-out-SL-cctools-workaround.patch \
</span><ins>+ 0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
</ins><span class="cx"> clang-format.patch \
</span><span class="cx"> clang-modernize.patch \
</span><span class="cx"> snowleopard-cmath.patch \
</span></span></pre></div>
<a id="trunkdportslangllvm35files0001UpdateCheckArchestofallbackonIntelppcifldvpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (0 => 131355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-10 11:56:47 UTC (rev 131355)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+From c6dc32fab57dc55f266c6a7dbc0b4ccbf84f75f7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 10 Jan 2015 03:34:51 -0800
+Subject: [PATCH] Update CheckArches to fallback on Intel/ppc if ld -v doesn't
+ report supported architectures
+
+Older versions of ld64 (eg: Xcode 3.x) do not report this.
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22182
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ make/platform/clang_darwin.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
+index 6f62170..0120547 100644
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -20,6 +20,8 @@ CheckArches = \
+ if $(LD) -v 2>&1 | grep "configured to support" \
+ | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+ result="$$result$$arch "; \
++ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
++ result="$$result$$arch "; \
+ else \
+ printf 1>&2 \
+ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'"; \
</ins></span></pre></div>
<a id="trunkdportslangllvm36Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/Portfile (131354 => 131355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-10 11:38:40 UTC (rev 131354)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-10 11:56:47 UTC (rev 131355)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span class="cx"> patchfiles-append scan-build-PR-35006.patch \
</span><span class="cx"> 0001-Comment-out-SL-cctools-workaround.patch \
</span><ins>+ 0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
</ins><span class="cx"> clang-format.patch \
</span><span class="cx"> clang-modernize.patch \
</span><span class="cx"> snowleopard-cmath.patch \
</span></span></pre></div>
<a id="trunkdportslangllvm36files0001UpdateCheckArchestofallbackonIntelppcifldvpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (0 => 131355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-10 11:56:47 UTC (rev 131355)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+From c6dc32fab57dc55f266c6a7dbc0b4ccbf84f75f7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 10 Jan 2015 03:34:51 -0800
+Subject: [PATCH] Update CheckArches to fallback on Intel/ppc if ld -v doesn't
+ report supported architectures
+
+Older versions of ld64 (eg: Xcode 3.x) do not report this.
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22182
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ make/platform/clang_darwin.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
+index 6f62170..0120547 100644
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -25,6 +25,8 @@ CheckArches = \
+ if $(LD) -v 2>&1 | grep "configured to support" \
+ | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+ result="$$result$$arch "; \
++ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
++ result="$$result$$arch "; \
+ else \
+ printf 1>&2 \
+ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
+--
+2.2.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>