<!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>[122685] trunk/dports/lang/rust/Portfile</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/122685">122685</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-07-26 11:28:07 -0700 (Sat, 26 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>rust: Update to 0.11.0 (#44314).
Also:
- Do not try building a cross-compiler, as it breaks the build something
awful.
- Only allow upstream-supported compilers, and remove reinplace that's
only required for older FSF GCC.
- Don't pass "--enable-clang", as the build picks up $CC reasonably well now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangrustPortfile">trunk/dports/lang/rust/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangrustPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/rust/Portfile (122684 => 122685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/rust/Portfile 2014-07-26 17:53:28 UTC (rev 122684)
+++ trunk/dports/lang/rust/Portfile 2014-07-26 18:28:07 UTC (rev 122685)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name rust
</span><del>-version 0.10
</del><ins>+version 0.11.0
</ins><span class="cx"> categories lang devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> supported_archs i386 x86_64
</span><span class="lines">@@ -36,26 +36,26 @@
</span><span class="cx"> master_sites http://static.rust-lang.org/dist:dist
</span><span class="cx"> distfiles ${distname}${extract.suffix}:dist
</span><span class="cx"> checksums ${distname}${extract.suffix} \
</span><del>- rmd160 5ef28883ac3803ae271373cacf1e37d1a14607ec \
- sha256 c72cfbbf03016804a81d7b68e8258ffaf018f8f5a25550ad64571ce6c2642cf9 \
</del><ins>+ rmd160 09f2fd0f5da3a7851b1984602d2acd0304764618 \
+ sha256 d1b3e36448bf12b8c9289024df416de10774b6d3235d7b1d22b248ef634411ba
</ins><span class="cx">
</span><span class="cx"> # Select the snapshot compiler; see src/snapshots.txt in distribution.
</span><span class="cx"> set stage0(distdir) rust-stage0
</span><del>-set stage0(date) 2014-03-28
-set stage0(rev) b8601a3
</del><ins>+set stage0(date) 2014-06-21
+set stage0(rev) db9af1d
</ins><span class="cx"> platform darwin i386 {
</span><span class="cx"> set stage0(platform) macos-${configure.build_arch}
</span><span class="cx"> switch ${configure.build_arch} {
</span><span class="cx"> x86_64 {
</span><del>- set stage0(hash) 22b884a3876cb3e40ad942ad68a496b5f239fca5
- set stage0(rmd160) b1553fad7008c88ab87c4756bec46946691ef8aa
- set stage0(sha256) 0b630e3147636b0b4345ed407af642e8f47c84734ccfe03fc494479ffd9e4b61
</del><ins>+ set stage0(hash) 4a8c2e1b7634d73406bac32a1a97893ec3ed818d
+ set stage0(rmd160) 6c7da644b90a567c615d83ff4af99b411a81a419
+ set stage0(sha256) 2c63e45ae276812f4429389584cf1eb0a9c0ef182f6f9e15a2731d3e30c03ea8
</ins><span class="cx"> }
</span><span class="cx"> i386 -
</span><span class="cx"> default {
</span><del>- set stage0(hash) 41fb091c3bf5f0ebe9341f26129be82782266ddd
- set stage0(rmd160) fcfb95acce79fca2da6bf2ef0c4fe50501a36268
- set stage0(sha256) edff6005ae0e45a5631441ae4c5e21dd0619aa623e700a56b8e3f517c23dd736
</del><ins>+ set stage0(hash) 3f25b2680efbab16ad074477a19d49dcce475977
+ set stage0(rmd160) 7c344247d62a417d703de720ac01881bcbf4fc25
+ set stage0(sha256) 42cef980dee52ad2cbd07795df07d3a3e96d013e08ea5a83cd54c266eecab698
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> set stage0(distfile) [join "rust stage0 ${stage0(date)}
</span><span class="lines">@@ -78,21 +78,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# Only use compilers supported by upstream
+# (https://github.com/rust-lang/rust#building-from-source).
+compiler.blacklist {clang < 211} \
+ *dragonegg* \
+ gcc-3.3 {*gcc-4.[0-6]} \
+ macports-clang-2.9
</ins><span class="cx">
</span><del>-# Upstream only supports gcc 4.4 and newer and clang based on LLVM
-# 3.0svn and newer. Allegedly.
-#
-# Unsupported compilers are blacklisted unless they have been verified
-# to build Rust correctly on OS X 10.8.3. Supported compilers that fail
-# to build correctly are blacklisted as well.
-compiler.blacklist apple-gcc-4.0 \
- {clang < 211} \
- gcc-3.3 gcc-4.0 gcc-4.2 \
- macports-clang-2.9 macports-clang-3.3 \
- macports-dragonegg-3.0 macports-dragonegg-3.1 \
- macports-dragonegg-3.2 macports-dragonegg-3.3 \
- macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4
-
</del><span class="cx"> patchfiles src_etc_local_stage0.sh.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -101,13 +93,6 @@
</span><span class="cx">
</span><span class="cx"> # Pre-release software builds with a ton of warnings.
</span><span class="cx"> reinplace {s/ -Werror//} ${worksrcpath}/mk/platform.mk
</span><del>-
- # FSF GCC older than 4.7 does not accept -arch.
- if {[string match {macports-gcc-4.[2-6]} ${configure.compiler}] ||
- [string match {macports-dragonegg-3.[0-2]} ${configure.compiler}]
- } then {
- reinplace -E {s/ -arch (i386|x86_64)//} ${worksrcpath}/mk/platform.mk
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Building the bundled LLVM requires Python 2.4-2.7. All supported
</span><span class="lines">@@ -129,7 +114,12 @@
</span><span class="cx"> # TODO: Test whether i386 machines can cross-compile for x86_64.
</span><span class="cx"> platform darwin i386 {
</span><span class="cx"> set tgts {i686-apple-darwin x86_64-apple-darwin}
</span><del>- configure.pre_args-append --target=[join $tgts ,]
</del><ins>+
+ # TODO: Trying to build a cross-compiler breaks Intel 64 builds as
+ # of 0.11.0. Worth fixing?
+ #
+ #configure.pre_args-append --target=[join $tgts ,]
+
</ins><span class="cx"> if {${configure.build_arch} eq "i386"} {
</span><span class="cx"> configure.pre_args-append --build=[lindex $tgts 0]
</span><span class="cx"> } else {
</span><span class="lines">@@ -140,9 +130,6 @@
</span><span class="cx"> configure.args --disable-docs \
</span><span class="cx"> --enable-local-rust \
</span><span class="cx"> --local-rust-root=${workpath}/${stage0(distdir)}
</span><del>-if {[string first clang ${configure.compiler}] != -1} {
- configure.args-append --enable-clang
-}
</del><span class="cx">
</span><span class="cx"> build.type gnu
</span><span class="cx"> build.args VERBOSE=1 \
</span></span></pre>
</div>
</div>
</body>
</html>