[103858] trunk/dports/lang/rust

[larryv at macports.org]

Revision: 103858
          https://trac.macports.org/changeset/103858
Author:   larryv at macports.org
Date:     2013-03-08 17:11:11 -0800 (Fri, 08 Mar 2013)
Log Message:
-----------
rust: Fix a bunch of compiler-choice issues.

* Make the configure script use our chosen compiler.
* Blacklist compilers deemed too old by upstream.
* Add fallback.
* Fix configure to accept clang 3.2.

Modified Paths:
--------------
    trunk/dports/lang/rust/Portfile
    trunk/dports/lang/rust/files/patch-configure.diff

Modified: trunk/dports/lang/rust/Portfile
===================================================================
--- trunk/dports/lang/rust/Portfile	2013-03-09 00:43:07 UTC (rev 103857)
+++ trunk/dports/lang/rust/Portfile	2013-03-09 01:11:11 UTC (rev 103858)
@@ -26,6 +26,25 @@
     reinplace "s/__BUILD_ARCH__/${configure.build_arch}/g" \
         ${worksrcpath}/configure
 }
+
+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 \
+                    macports-gcc-4.2 macports-gcc-4.3 \
+                    macports-clang-2.9
+
+# Use MacPorts' clang as fallback compiler.
+# TODO: Remove when base fallback lists are updated (2.2?).
+compiler.fallback-append            macports-clang-3.2
+if {${configure.compiler} == "macports-clang-3.2"} {
+    depends_build-append            port:clang-3.2
+    depends_skip_archcheck-append   clang-3.2
+}
+
+if {[string match *clang* ${configure.compiler}]} {
+    configure.args-append   --enable-clang
+}
+
 configure.universal_args-delete \
                     --disable-dependency-tracking
 

Modified: trunk/dports/lang/rust/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/rust/files/patch-configure.diff	2013-03-09 00:43:07 UTC (rev 103857)
+++ trunk/dports/lang/rust/files/patch-configure.diff	2013-03-09 01:11:11 UTC (rev 103858)
@@ -1,5 +1,5 @@
 --- configure.orig	2012-12-18 18:29:12.000000000 -0500
-+++ configure	2013-03-08 17:52:39.000000000 -0500
++++ configure	2013-03-08 20:04:05.000000000 -0500
 @@ -234,17 +234,7 @@
  msg "inspecting environment"
  
@@ -19,3 +19,25 @@
  
  # The goal here is to come up with the same triple as LLVM would,
  # at least for the subset of platforms we're willing to target.
+@@ -382,8 +372,10 @@
+     probe_need CFG_GIT     git
+ fi
+ 
+-probe CFG_CLANG            clang++
+-probe CFG_GCC              gcc
++# CFG_CLANG and CFG_GCC will be from the same compiler suite now, but we
++# don't care because we're forcing a particular compiler anyway.
++probe CFG_CLANG            $CXX
++probe CFG_GCC              $CC
+ probe CFG_LD               ld
+ probe CFG_LLVM_CONFIG      llvm-config
+ probe CFG_VALGRIND         valgrind
+@@ -516,7 +508,7 @@
+                       | cut -d ' ' -f 2)
+ 
+     case $CFG_CLANG_VERSION in
+-        (3.0svn | 3.0 | 3.1 | 4.0 | 4.1)
++        (3.0svn | 3.0 | 3.1 | 3.2 | 4.0 | 4.1)
+         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
+         CFG_C_COMPILER="clang"
+         ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130308/530dd4ca/attachment.html>