<!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>[115699] 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/115699">115699</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-08 23:49:02 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-3.[45]: Revert <a href="https://trac.macports.org/changeset/115581">r115581</a>
Using gmake did not help the parallel build issue on Snow Leopard and Leopard, so reverting.</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm33Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.3/Portfile (115698 => 115699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/Portfile 2014-01-09 06:47:50 UTC (rev 115698)
+++ trunk/dports/lang/llvm-3.3/Portfile 2014-01-09 07:49:02 UTC (rev 115699)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> depends_extract bin:svn:subversion
</span><span class="cx"> depends_skip_archcheck-append ld64 subversion
</span><span class="cx">
</span><del>- default_variants +analyzer
</del><ins>+ default_variants-append +analyzer
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #fetch.type svn
</span><span class="lines">@@ -256,6 +256,33 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+set pythonver ""
+set pythonverdot ""
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+ default_variants-append +python27
+}
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+ set pythonver 25
+ set pythonverdot 2.5
+ configure.args-append --with-python=${prefix}/bin/python2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+ set pythonver 26
+ set pythonverdot 2.6
+ configure.args-append --with-python=${prefix}/bin/python2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+ set pythonver 27
+ set pythonverdot 2.7
+ configure.args-append --with-python=${prefix}/bin/python2.7
+}
+
+
+
</ins><span class="cx"> if {${subport} == "llvm-${llvm_version}"} {
</span><span class="cx"> variant ocaml description {Enable generation of OCaml binding} {
</span><span class="cx"> depends_lib-append port:ocaml
</span><span class="lines">@@ -268,31 +295,6 @@
</span><span class="cx"> } elseif {${subport} == "clang-${llvm_version}"} {
</span><span class="cx"> variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
</span><span class="cx">
</span><del>- set pythonver ""
- set pythonverdot ""
-
- if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
- }
-
- variant python25 conflicts python26 python27 description {Use python 2.5} {
- set pythonver 25
- set pythonverdot 2.5
- configure.args-append --with-python=${prefix}/bin/python2.5
- }
-
- variant python26 conflicts python25 python27 description {Use python 2.6} {
- set pythonver 26
- set pythonverdot 2.6
- configure.args-append --with-python=${prefix}/bin/python2.6
- }
-
- variant python27 conflicts python25 python26 description {Use python 2.7} {
- set pythonver 27
- set pythonverdot 2.7
- configure.args-append --with-python=${prefix}/bin/python2.7
- }
-
</del><span class="cx"> variant analyzer description {Install clang static analyzer} {
</span><span class="cx"> if {[string equal "${pythonver}" ""]} {
</span><span class="cx"> ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"
</span></span></pre></div>
<a id="trunkdportslangllvm34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/Portfile (115698 => 115699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/Portfile 2014-01-09 06:47:50 UTC (rev 115698)
+++ trunk/dports/lang/llvm-3.4/Portfile 2014-01-09 07:49:02 UTC (rev 115699)
</span><span class="lines">@@ -177,13 +177,6 @@
</span><span class="cx"> patchfiles-append leopard-no-asan.patch
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${os.major} < 11} {
- # Tiger's DevTools make has issues with the nested ifs in compiler-rt
- # Our SnowLeopard buildbot seems to be running into parallel build issues
- depends_run-append port:gmake
- build.cmd ${prefix}/bin/gmake
- }
-
</del><span class="cx"> if {${os.major} < 10} {
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "/TARGETS_TO_BUILD=/s/R600//" ${worksrcpath}/configure
</span><span class="lines">@@ -191,6 +184,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${os.major} < 9} {
</span><ins>+ # Tiger's DevTools make has issues with the nested ifs in compiler-rt
+ depends_run-append port:gmake
+ build.cmd ${prefix}/bin/gmake
+
</ins><span class="cx"> post-configure {
</span><span class="cx"> reinplace "/^RPATH/s/=.*/=/" ${worksrcpath}/Makefile.config
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportslangllvm35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/Portfile (115698 => 115699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile 2014-01-09 06:47:50 UTC (rev 115698)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-01-09 07:49:02 UTC (rev 115699)
</span><span class="lines">@@ -161,13 +161,6 @@
</span><span class="cx"> patchfiles-append leopard-no-asan.patch
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${os.major} < 11} {
- # Tiger's DevTools make has issues with the nested ifs in compiler-rt
- # Our SnowLeopard buildbot seems to be running into parallel build issues
- depends_run-append port:gmake
- build.cmd ${prefix}/bin/gmake
- }
-
</del><span class="cx"> if {${os.major} < 10} {
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "/TARGETS_TO_BUILD=/s/R600//" ${worksrcpath}/configure
</span><span class="lines">@@ -175,6 +168,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${os.major} < 9} {
</span><ins>+ # Tiger's DevTools make has issues with the nested ifs in compiler-rt
+ depends_run-append port:gmake
+ build.cmd ${prefix}/bin/gmake
+
</ins><span class="cx"> post-configure {
</span><span class="cx"> reinplace "/^RPATH/s/=.*/=/" ${worksrcpath}/Makefile.config
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>