<!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>[131262] 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/131262">131262</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-07 14:52:46 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>clang-3.[3456]: On Leopard, default to -fno-blocks
Not revbumping 3.5 and 3.6 because they still don't build with Leopard
Not applying ot 3.2 and earlier because I'm considering obsoleting those ports</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm33files0001LeopardDefaulttofnoblockspatch">trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch</a></li>
<li><a href="#trunkdportslangllvm34files0001LeopardDefaulttofnoblockspatch">trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch</a></li>
<li><a href="#trunkdportslangllvm35files0001LeopardDefaulttofnoblockspatch">trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch</a></li>
<li><a href="#trunkdportslangllvm36files0001LeopardDefaulttofnoblockspatch">trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.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 (131261 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.3/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> set llvm_version 3.3
</span><span class="cx"> revision 4
</span><span class="cx"> name llvm-${llvm_version}
</span><del>-subport clang-${llvm_version} { revision 5 }
</del><ins>+subport clang-${llvm_version} { revision 6 }
</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">@@ -171,7 +171,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} == "clang-${llvm_version}" && ${os.major} <= 9} {
</span><del>- patchfiles-append leopard-no-asan.patch
</del><ins>+ patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # TODO: The llvm build system sets a 10.1 deployment target on Yosemite
</span></span></pre></div>
<a id="trunkdportslangllvm33files0001LeopardDefaulttofnoblockspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch (0 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
</ins></span></pre></div>
<a id="trunkdportslangllvm34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/Portfile (131261 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> set llvm_version_no_dot 34
</span><span class="cx"> name llvm-${llvm_version}
</span><span class="cx"> revision 1
</span><del>-subport clang-${llvm_version} { revision 3 }
</del><ins>+subport clang-${llvm_version} { revision 4 }
</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">@@ -199,7 +199,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
</span><del>- patchfiles-append leopard-no-asan.patch
</del><ins>+ patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # TODO: The llvm build system sets a 10.1 deployment target on Yosemite
</span></span></pre></div>
<a id="trunkdportslangllvm34files0001LeopardDefaulttofnoblockspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch (0 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
</ins></span></pre></div>
<a id="trunkdportslangllvm35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/Portfile (131261 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -221,6 +221,10 @@
</span><span class="cx"> configure.optflags -Os
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
+ patchfiles-append 0001-Leopard-Default-to-fno-blocks.patch
+ }
+
</ins><span class="cx"> # TODO: The llvm build system sets a 10.1 deployment target on Yosemite
</span><span class="cx"> if {[vercmp ${macosx_deployment_target} 10.10] >= 0} {
</span><span class="cx"> macosx_deployment_target 10.9
</span></span></pre></div>
<a id="trunkdportslangllvm35files0001LeopardDefaulttofnoblockspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch (0 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
</ins></span></pre></div>
<a id="trunkdportslangllvm36Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/Portfile (131261 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -204,9 +204,8 @@
</span><span class="cx"> configure.optflags -Os
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # TODO: The llvm build system sets a 10.1 deployment target on Yosemite
- if {[vercmp ${macosx_deployment_target} 10.10] >= 0} {
- macosx_deployment_target 10.9
</del><ins>+ if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
+ patchfiles-append 0001-Leopard-Default-to-fno-blocks.patch
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm36files0001LeopardDefaulttofnoblockspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch (0 => 131262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>