<!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>[120636] 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/120636">120636</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-06-03 21:22:34 -0700 (Tue, 03 Jun 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>llvm-3.{3,4,5}: Support a 10.10 deployment target</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>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm33filesyosemitedeploymenttargetpatch">trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch</a></li>
<li><a href="#trunkdportslangllvm34filesyosemitedeploymenttargetpatch">trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch</a></li>
<li><a href="#trunkdportslangllvm35filesyosemitedeploymenttargetpatch">trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.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 (120635 => 120636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/Portfile        2014-06-04 02:56:57 UTC (rev 120635)
+++ trunk/dports/lang/llvm-3.3/Portfile        2014-06-04 04:22:34 UTC (rev 120636)
</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} {}
</del><ins>+subport                 clang-${llvm_version} { revision 5 }
</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">@@ -97,6 +97,7 @@
</span><span class="cx">                          0001-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx">                          mavericks-libc++.patch \
</span><span class="cx">                          snowleopard-cmath.patch \
</span><ins>+                         yosemite-deployment-target.patch \
</ins><span class="cx">                          export_dynamic.patch
</span><span class="cx"> 
</span><span class="cx">     build.target        clang-only
</span></span></pre></div>
<a id="trunkdportslangllvm33filesyosemitedeploymenttargetpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch (0 => 120636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch                                (rev 0)
+++ trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch        2014-06-04 04:22:34 UTC (rev 120636)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- a/tools/clang/lib/Basic/Targets.cpp
++++ b/tools/clang/lib/Basic/Targets.cpp
+@@ -156,12 +156,22 @@ static void getDarwinDefines(MacroBuilde
+     // version.
+     assert(Triple.getEnvironmentName().empty() &amp;&amp; &quot;Invalid environment!&quot;);
+     assert(Maj &lt; 100 &amp;&amp; Min &lt; 100 &amp;&amp; Rev &lt; 100 &amp;&amp; &quot;Invalid version!&quot;);
+-    char Str[5];
+-    Str[0] = '0' + (Maj / 10);
+-    Str[1] = '0' + (Maj % 10);
+-    Str[2] = '0' + std::min(Min, 9U);
+-    Str[3] = '0' + std::min(Rev, 9U);
+-    Str[4] = '\0';
++    char Str[7];
++    if (Maj &lt; 10 || Maj == 10 &amp;&amp; Min &lt; 10) {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + std::min(Min, 9U);
++      Str[3] = '0' + std::min(Rev, 9U);
++      Str[4] = '\0';
++    } else {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + (Min / 10);
++      Str[3] = '0' + (Min % 10);
++      Str[4] = '0' + (Rev / 10);
++      Str[5] = '0' + (Rev % 10);
++      Str[6] = '\0';
++    }
+     Builder.defineMacro(&quot;__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__&quot;, Str);
+   }

+
</ins></span></pre></div>
<a id="trunkdportslangllvm34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/Portfile (120635 => 120636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/Portfile        2014-06-04 02:56:57 UTC (rev 120635)
+++ trunk/dports/lang/llvm-3.4/Portfile        2014-06-04 04:22:34 UTC (rev 120636)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> set llvm_version_no_dot 34
</span><span class="cx"> revision                3
</span><span class="cx"> name                    llvm-${llvm_version}
</span><del>-subport                 clang-${llvm_version} {}
</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">@@ -110,6 +110,7 @@
</span><span class="cx">                          0001-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx">                          clang-format.patch \
</span><span class="cx">                          clang-modernize.patch \
</span><ins>+                         yosemite-deployment-target.patch \
</ins><span class="cx">                          snowleopard-cmath.patch
</span><span class="cx"> 
</span><span class="cx">     build.target        clang-only
</span></span></pre></div>
<a id="trunkdportslangllvm34filesyosemitedeploymenttargetpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch (0 => 120636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch                                (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch        2014-06-04 04:22:34 UTC (rev 120636)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+--- a/tools/clang/lib/Basic/Targets.cpp
++++ b/tools/clang/lib/Basic/Targets.cpp
+@@ -161,12 +161,22 @@ static void getDarwinDefines(MacroBuilde
+       // version.
+       assert(Triple.getEnvironmentName().empty() &amp;&amp; &quot;Invalid environment!&quot;);
+       assert(Maj &lt; 100 &amp;&amp; Min &lt; 100 &amp;&amp; Rev &lt; 100 &amp;&amp; &quot;Invalid version!&quot;);
+-      char Str[5];
+-      Str[0] = '0' + (Maj / 10);
+-      Str[1] = '0' + (Maj % 10);
+-      Str[2] = '0' + std::min(Min, 9U);
+-      Str[3] = '0' + std::min(Rev, 9U);
+-      Str[4] = '\0';
++      char Str[7];
++      if (Maj &lt; 10 || Maj == 10 &amp;&amp; Min &lt; 10) {
++        Str[0] = '0' + (Maj / 10);
++        Str[1] = '0' + (Maj % 10);
++        Str[2] = '0' + std::min(Min, 9U);
++        Str[3] = '0' + std::min(Rev, 9U);
++        Str[4] = '\0';
++      } else {
++        Str[0] = '0' + (Maj / 10);
++        Str[1] = '0' + (Maj % 10);
++        Str[2] = '0' + (Min / 10);
++        Str[3] = '0' + (Min % 10);
++        Str[4] = '0' + (Rev / 10);
++        Str[5] = '0' + (Rev % 10);
++        Str[6] = '\0';
++      }
+       Builder.defineMacro(&quot;__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__&quot;, Str);
+     }
+   }
</ins></span></pre></div>
<a id="trunkdportslangllvm35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/Portfile (120635 => 120636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile        2014-06-04 02:56:57 UTC (rev 120635)
+++ trunk/dports/lang/llvm-3.5/Portfile        2014-06-04 04:22:34 UTC (rev 120636)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> set llvm_version_no_dot 35
</span><span class="cx"> revision                2
</span><span class="cx"> name                    llvm-${llvm_version}
</span><del>-subport                 clang-${llvm_version} {}
</del><ins>+subport                 clang-${llvm_version} { revision 3 }
</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">@@ -91,6 +91,7 @@
</span><span class="cx">                          0001-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx">                          clang-format.patch \
</span><span class="cx">                          clang-modernize.patch \
</span><ins>+                         yosemite-deployment-target.patch \
</ins><span class="cx">                          snowleopard-cmath.patch
</span><span class="cx"> 
</span><span class="cx">     build.target        clang-only
</span></span></pre></div>
<a id="trunkdportslangllvm35filesyosemitedeploymenttargetpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch (0 => 120636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch                                (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch        2014-06-04 04:22:34 UTC (rev 120636)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+--- a/tools/clang/lib/Basic/Targets.cpp
++++ b/tools/clang/lib/Basic/Targets.cpp
+@@ -155,12 +155,22 @@ static void getDarwinDefines(MacroBuilde
+     // revision numbers). So, we limit them to the maximum representable
+     // version.
+     assert(Maj &lt; 100 &amp;&amp; Min &lt; 100 &amp;&amp; Rev &lt; 100 &amp;&amp; &quot;Invalid version!&quot;);
+-    char Str[5];
+-    Str[0] = '0' + (Maj / 10);
+-    Str[1] = '0' + (Maj % 10);
+-    Str[2] = '0' + std::min(Min, 9U);
+-    Str[3] = '0' + std::min(Rev, 9U);
+-    Str[4] = '\0';
++    char Str[7];
++    if (Maj &lt; 10 || Maj == 10 &amp;&amp; Min &lt; 10) {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + std::min(Min, 9U);
++      Str[3] = '0' + std::min(Rev, 9U);
++      Str[4] = '\0';
++    } else {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + (Min / 10);
++      Str[3] = '0' + (Min % 10);
++      Str[4] = '0' + (Rev / 10);
++      Str[5] = '0' + (Rev % 10);
++      Str[6] = '\0';
++    }
+     Builder.defineMacro(&quot;__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__&quot;, Str);
+   }

</ins></span></pre>
</div>
</div>

</body>
</html>