[103896] users/larryv/dports/lang/rust/Portfile

[larryv at macports.org]

Revision: 103896
          https://trac.macports.org/changeset/103896
Author:   larryv at macports.org
Date:     2013-03-09 14:17:32 -0800 (Sat, 09 Mar 2013)
Log Message:
-----------
[sandbox] rust: Put identifying info for snapshot compiler in one block.

Modified Paths:
--------------
    users/larryv/dports/lang/rust/Portfile

Modified: users/larryv/dports/lang/rust/Portfile
===================================================================
--- users/larryv/dports/lang/rust/Portfile	2013-03-09 21:24:55 UTC (rev 103895)
+++ users/larryv/dports/lang/rust/Portfile	2013-03-09 22:17:32 UTC (rev 103896)
@@ -20,36 +20,39 @@
                     libraries, tools and documentation.
 homepage            http://www.rust-lang.org
 
-
-# Main distribution
-master_sites        http://dl.rust-lang.org/dist:dist
-distfiles           ${distname}${extract.suffix}:dist
-checksums           ${distname}${extract.suffix} \
-                        rmd160  b4988da7be984aa1337f4076e96e6d0c72e3170d \
-                        sha256  d326d22707f0562d669c11efbc33ae812ddbf76ab78f07087fc5beb095a8928a
-
-# stage0 snapshot compilers
-master_sites-append http://static.rust-lang.org/stage0-snapshots:stage0
-depends_extract     bin:bzip2:bzip2
+# ===== stage0 snapshot compiler =====
+set stage0(date)                2012-12-19
+set stage0(rev)                 8554d5e
+set stage0(platform)            macos-${configure.build_arch}
 switch ${configure.build_arch} {
     i386 {
-        set stage0(platform)    macos-i386
         set stage0(hash)        151ff211c01f0b7a1895b93ff0bc021bf1472346
         set stage0(rmd160)      300b17458073a8704817821bd5406189a264f765
         set stage0(sha256)      5e598d4c45ee2dd8b7f2b69d92f60d16e57991e796d76ca255a612357a5e48e0
     }
     x86_64 {
-        set stage0(platform)    macos-x86_64
         set stage0(hash)        e4564933f11b17f7dbd25b61032233693da21dc5
         set stage0(rmd160)      3d966bd2d17e3f2c74ed78f3674439c89d5a16ee
         set stage0(sha256)      a2e287a683128e2e213e11c5b9f92e5e628eb63163591d61523549deb2e21f7d
     }
 }
-set stage0(dist) rust-stage0-2012-12-19-8554d5e-${stage0(platform)}-${stage0(hash)}.tar.bz2
-distfiles-append    ${stage0(dist)}:stage0
-checksums-append    ${stage0(dist)} \
+# ====================================
+
+set stage0(dist) [join "rust stage0 ${stage0(date)} ${stage0(rev)}
+                        ${stage0(platform)} ${stage0(hash)}" -].tar.bz2
+
+master_sites        http://dl.rust-lang.org/dist:dist \
+                    http://static.rust-lang.org/stage0-snapshots:stage0
+distfiles           ${distname}${extract.suffix}:dist \
+                    ${stage0(dist)}:stage0
+checksums           ${distname}${extract.suffix} \
+                        rmd160  b4988da7be984aa1337f4076e96e6d0c72e3170d \
+                        sha256  d326d22707f0562d669c11efbc33ae812ddbf76ab78f07087fc5beb095a8928a \
+                    ${stage0(dist)} \
                         rmd160  ${stage0(rmd160)} \
                         sha256  ${stage0(sha256)}
+
+depends_extract     bin:bzip2:bzip2
 extract.only-delete ${stage0(dist)}
 post-extract {
     set expand "bzip2 -dc ${distpath}/${stage0(dist)}"
@@ -63,10 +66,8 @@
         ${worksrcpath}/configure
 }
 
-configure.args      --disable-docs \
-                    --enable-local-rust \
-                    --local-rust-root=${workpath}/rust-stage0
-
+# Upstream only supports GCC 4.4 and newer and Clang based on LLVM
+# 3.0svn and newer.
 compiler.blacklist  gcc-3.3 gcc-4.0 gcc-4.2 \
                     apple-gcc-4.0 apple-gcc-4.2 \
                     llvm-gcc-4.2 macports-llvm-gcc-4.2 \
@@ -81,21 +82,23 @@
     depends_skip_archcheck-append   clang-3.2
 }
 
+configure.args      --disable-docs \
+                    --enable-local-rust \
+                    --local-rust-root=${workpath}/rust-stage0
+
+build.args          CC=${configure.cc} \
+                    CXX=${configure.cxx} \
+                    CPP=${configure.cpp} \
+                    VERBOSE=1
+
 if {[string match *clang* ${configure.compiler}]} {
     configure.args-append   --enable-clang
+    build.args-delete       CPP=${configure.cpp}
     build.args-append       CPP="${configure.cc} -E"
-} else {
-    build.args-append       CPP=${configure.cpp}
 }
 
-build.args-append   CC=${configure.cc} \
-                    CXX=${configure.cxx} \
-                    VERBOSE=1
 use_parallel_build  no
 
-livecheck.url       ${homepage}/
-livecheck.regex     "/release-(\\d\.\\d)/"
-
 variant llvm30 conflicts llvm31 llvm32 llvm33 description {Use LLVM 3.0} {
     depends_lib-append      port:llvm-3.0
     configure.args-append   --llvm-root=${prefix}/libexec/llvm-3.0
@@ -118,3 +121,6 @@
 } then {
     default_variants    +llvm32
 }
+
+livecheck.url       ${homepage}/
+livecheck.regex     "/release-(\\d\.\\d)/"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130309/11067e3c/attachment.html>