[102899] trunk/dports/devel/cctools/Portfile

[jeremyhu at macports.org]

Revision: 102899
          https://trac.macports.org/changeset/102899
Author:   jeremyhu at macports.org
Date:     2013-02-10 14:56:10 -0800 (Sun, 10 Feb 2013)
Log Message:
-----------
cctools: Add llvm33 variant and make llvm32 default

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2013-02-10 21:49:27 UTC (rev 102898)
+++ trunk/dports/devel/cctools/Portfile	2013-02-10 22:56:10 UTC (rev 102899)
@@ -41,31 +41,36 @@
     supported_archs     i386 x86_64
 }
 
-if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ${os.major} >= 9} {
-    default_variants +llvm31
+if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ${os.major} >= 9} {
+    default_variants +llvm32
 }
 
 set llvm_version {}
-variant llvm29 conflicts llvm30 llvm31 llvm32 description {Use llvm-2.9 for libLTO and llvm-mc} {
+variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 description {Use llvm-2.9 for libLTO and llvm-mc} {
     set llvm_version        2.9
     depends_run-append      port:llvm-${llvm_version}
 }
 
-variant llvm30 conflicts llvm29 llvm31 llvm32 description {Use llvm-3.0 for libLTO and llvm-mc} {
+variant llvm30 conflicts llvm29 llvm31 llvm32 llvm33 description {Use llvm-3.0 for libLTO and llvm-mc} {
     set llvm_version        3.0
     depends_run-append      port:llvm-${llvm_version}
 }
 
-variant llvm31 conflicts llvm29 llvm30 llvm32 description {Use llvm-3.1 for libLTO and llvm-mc} {
+variant llvm31 conflicts llvm29 llvm30 llvm32 llvm33 description {Use llvm-3.1 for libLTO and llvm-mc} {
     set llvm_version        3.1
     depends_run-append      port:llvm-${llvm_version}
 }
 
-variant llvm32 conflicts llvm29 llvm30 llvm31 description {Use llvm-3.2 for libLTO and llvm-mc} {
+variant llvm32 conflicts llvm29 llvm30 llvm31 llvm33 description {Use llvm-3.2 for libLTO and llvm-mc} {
     set llvm_version        3.2
     depends_run-append      port:llvm-${llvm_version}
 }
 
+variant llvm33 conflicts llvm29 llvm30 llvm31 llvm32 description {Use llvm-3.3 for libLTO and llvm-mc} {
+    set llvm_version        3.3
+    depends_run-append      port:llvm-${llvm_version}
+}
+
 use_configure           no
 destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
 
@@ -75,7 +80,7 @@
     reinplace "/^COMMON_SUBDIRS/s/ ld / /" ${worksrcpath}/Makefile
 
     # Use our chosen version of llvm
-    if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31] || [variant_isset llvm32]} {
+    if {${llvm_version} != ""} {
         reinplace "s:\"llvm-mc\":\"llvm-mc-mp-${llvm_version}\":" ${worksrcpath}/as/driver.c
         reinplace "s:@@LLVM_LIBDIR@@:${prefix}/libexec/llvm-${llvm_version}/lib:" ${worksrcpath}/libstuff/lto.c
     }
@@ -112,7 +117,7 @@
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 
-    if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31] || [variant_isset llvm32]} {
+    if {${llvm_version} != ""} {
         build.args-append \
             LTO=-DLTO_SUPPORT \
             RC_CFLAGS="[get_canonical_archflags] -I`llvm-config-mp-${llvm_version} --includedir`" \
@@ -142,7 +147,7 @@
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 
-    if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31] || [variant_isset llvm32]} {
+    if {${llvm_version} != ""} {
         destroot.args-append \
             LTO=-DLTO_SUPPORT \
             RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130210/c955d253/attachment.html>