[103873] users/larryv/dports/lang/rust

[larryv at macports.org]

Revision: 103873
          https://trac.macports.org/changeset/103873
Author:   larryv at macports.org
Date:     2013-03-09 00:15:10 -0800 (Sat, 09 Mar 2013)
Log Message:
-----------
[sandbox] rust: Use MacPorts LLVM instead of building own.

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

Modified: users/larryv/dports/lang/rust/Portfile
===================================================================
--- users/larryv/dports/lang/rust/Portfile	2013-03-09 08:03:06 UTC (rev 103872)
+++ users/larryv/dports/lang/rust/Portfile	2013-03-09 08:15:10 UTC (rev 103873)
@@ -92,3 +92,26 @@
 
 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
+}
+variant llvm31 conflicts llvm30 llvm32 llvm33 description {Use LLVM 3.1} {
+    depends_lib-append      port:llvm-3.1
+    configure.args-append   --llvm-root=${prefix}/libexec/llvm-3.1
+}
+variant llvm32 conflicts llvm30 llvm31 llvm33 description {Use LLVM 3.2} {
+    depends_lib-append      port:llvm-3.2
+    configure.args-append   --llvm-root=${prefix}/libexec/llvm-3.2
+}
+variant llvm33 conflicts llvm30 llvm31 llvm32 description {Use LLVM 3.3} {
+    depends_lib-append      port:llvm-3.3
+    configure.args-append   --llvm-root=${prefix}/libexec/llvm-3.3
+}
+
+if {![variant_isset llvm30] && ![variant_isset llvm31] &&
+    ![variant_isset llvm33]
+} then {
+    default_variants    +llvm32
+}

Modified: users/larryv/dports/lang/rust/files/patch-configure.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-configure.diff	2013-03-09 08:03:06 UTC (rev 103872)
+++ users/larryv/dports/lang/rust/files/patch-configure.diff	2013-03-09 08:15:10 UTC (rev 103873)
@@ -1,5 +1,5 @@
 --- configure.orig	2012-12-18 18:29:12.000000000 -0500
-+++ configure	2013-03-09 02:59:09.000000000 -0500
++++ configure	2013-03-09 03:11:12.000000000 -0500
 @@ -234,17 +234,7 @@
  msg "inspecting environment"
  
@@ -40,6 +40,15 @@
  probe CFG_LD               ld
  probe CFG_LLVM_CONFIG      llvm-config
  probe CFG_VALGRIND         valgrind
+@@ -494,7 +485,7 @@
+     LLVM_VERSION=$($LLVM_CONFIG --version)
+ 
+     case $LLVM_VERSION in
+-	(3.1svn|3.1|3.0svn|3.0)
++	(3.?svn|3.?)
+ 	    msg "found ok version of LLVM: $LLVM_VERSION"
+ 	    ;;
+ 	(*)
 @@ -516,7 +507,7 @@
                        | cut -d ' ' -f 2)
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130309/8078518b/attachment.html>