[122685] trunk/dports/lang/rust/Portfile

[larryv at macports.org]

Revision: 122685
          https://trac.macports.org/changeset/122685
Author:   larryv at macports.org
Date:     2014-07-26 11:28:07 -0700 (Sat, 26 Jul 2014)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/lang/rust/Portfile

Modified: trunk/dports/lang/rust/Portfile
===================================================================
--- 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)
@@ -6,7 +6,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                rust
-version             0.10
+version             0.11.0
 categories          lang devel
 platforms           darwin
 supported_archs     i386 x86_64
@@ -36,26 +36,26 @@
 master_sites        http://static.rust-lang.org/dist:dist
 distfiles           ${distname}${extract.suffix}:dist
 checksums           ${distname}${extract.suffix} \
-                        rmd160  5ef28883ac3803ae271373cacf1e37d1a14607ec \
-                        sha256  c72cfbbf03016804a81d7b68e8258ffaf018f8f5a25550ad64571ce6c2642cf9 \
+                        rmd160  09f2fd0f5da3a7851b1984602d2acd0304764618 \
+                        sha256  d1b3e36448bf12b8c9289024df416de10774b6d3235d7b1d22b248ef634411ba
 
 # Select the snapshot compiler; see src/snapshots.txt in distribution.
 set stage0(distdir)             rust-stage0
-set stage0(date)                2014-03-28
-set stage0(rev)                 b8601a3
+set stage0(date)                2014-06-21
+set stage0(rev)                 db9af1d
 platform darwin i386 {
     set stage0(platform)        macos-${configure.build_arch}
     switch ${configure.build_arch} {
         x86_64 {
-            set stage0(hash)    22b884a3876cb3e40ad942ad68a496b5f239fca5
-            set stage0(rmd160)  b1553fad7008c88ab87c4756bec46946691ef8aa
-            set stage0(sha256)  0b630e3147636b0b4345ed407af642e8f47c84734ccfe03fc494479ffd9e4b61
+            set stage0(hash)    4a8c2e1b7634d73406bac32a1a97893ec3ed818d
+            set stage0(rmd160)  6c7da644b90a567c615d83ff4af99b411a81a419
+            set stage0(sha256)  2c63e45ae276812f4429389584cf1eb0a9c0ef182f6f9e15a2731d3e30c03ea8
         }
         i386 -
         default {
-            set stage0(hash)    41fb091c3bf5f0ebe9341f26129be82782266ddd
-            set stage0(rmd160)  fcfb95acce79fca2da6bf2ef0c4fe50501a36268
-            set stage0(sha256)  edff6005ae0e45a5631441ae4c5e21dd0619aa623e700a56b8e3f517c23dd736
+            set stage0(hash)    3f25b2680efbab16ad074477a19d49dcce475977
+            set stage0(rmd160)  7c344247d62a417d703de720ac01881bcbf4fc25
+            set stage0(sha256)  42cef980dee52ad2cbd07795df07d3a3e96d013e08ea5a83cd54c266eecab698
         }
     }
     set stage0(distfile)        [join "rust stage0 ${stage0(date)}
@@ -78,21 +78,13 @@
     }
 }
 
+# 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
 
-# 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
-
 patchfiles          src_etc_local_stage0.sh.diff
 
 post-patch {
@@ -101,13 +93,6 @@
 
     # Pre-release software builds with a ton of warnings.
     reinplace {s/ -Werror//} ${worksrcpath}/mk/platform.mk
-
-    # 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
-    }
 }
 
 # Building the bundled LLVM requires Python 2.4-2.7. All supported
@@ -129,7 +114,12 @@
 # TODO: Test whether i386 machines can cross-compile for x86_64.
 platform darwin i386 {
     set tgts {i686-apple-darwin x86_64-apple-darwin}
-    configure.pre_args-append       --target=[join $tgts ,]
+
+    # 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 ,]
+
     if {${configure.build_arch} eq "i386"} {
         configure.pre_args-append   --build=[lindex $tgts 0]
     } else {
@@ -140,9 +130,6 @@
 configure.args              --disable-docs \
                             --enable-local-rust \
                             --local-rust-root=${workpath}/${stage0(distdir)}
-if {[string first clang ${configure.compiler}] != -1} {
-    configure.args-append   --enable-clang
-}
 
 build.type          gnu
 build.args          VERBOSE=1 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140726/3b672681/attachment-0001.html>