[102900] trunk/dports/devel/ld64/Portfile

[jeremyhu at macports.org]

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

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

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2013-02-10 22:56:10 UTC (rev 102899)
+++ trunk/dports/devel/ld64/Portfile	2013-02-10 22:56:33 UTC (rev 102900)
@@ -31,11 +31,11 @@
 # dependency cycle as llvm requires apple-gcc42 and ld64 to build correctly.  Users
 # wanting LTO support in ld64 on Tiger can install the +llvm variant after llvm
 # has been installed.
-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
 
     # Leopard/powerpc has the option to not be LTO
-    if {![variant_isset llvm31] && ${os.arch} != "powerpc"} {
+    if {![variant_isset llvm32] && ${os.arch} != "powerpc"} {
         ui_error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
         return -code error "Your platform cannot be configured without LTO support in ld64.  Please enable one of the llvmXX variants, and try again."
     }
@@ -44,26 +44,31 @@
 variant universal {}
 
 set llvm_version {}
-variant llvm29 conflicts llvm30 llvm31 llvm32 description {Use llvm-2.9 for libLTO} {
+variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 description {Use llvm-2.9 for libLTO} {
     set llvm_version        2.9
     depends_lib-append      port:llvm-${llvm_version}
 }
 
-variant llvm30 conflicts llvm29 llvm31 llvm32 description {Use llvm-3.0 for libLTO} {
+variant llvm30 conflicts llvm29 llvm31 llvm32 llvm33 description {Use llvm-3.0 for libLTO} {
     set llvm_version        3.0
     depends_lib-append      port:llvm-${llvm_version}
 }
 
-variant llvm31 conflicts llvm29 llvm30 llvm32 description {Use llvm-3.1 for libLTO} {
+variant llvm31 conflicts llvm29 llvm30 llvm32 llvm33 description {Use llvm-3.1 for libLTO} {
     set llvm_version        3.1
     depends_lib-append      port:llvm-${llvm_version}
 }
 
-variant llvm32 conflicts llvm29 llvm30 llvm31 description {Use llvm-3.2 for libLTO} {
+variant llvm32 conflicts llvm29 llvm30 llvm31 llvm33 description {Use llvm-3.2 for libLTO} {
     set llvm_version        3.2
     depends_lib-append      port:llvm-${llvm_version}
 }
 
+variant llvm33 conflicts llvm29 llvm30 llvm31 llvm32 description {Use llvm-3.3 for libLTO} {
+    set llvm_version        3.3
+    depends_lib-append      port:llvm-${llvm_version}
+}
+
 set makefile "Makefile-133"
 
 if {${os.arch} == "powerpc" || ${os.major} < 9} {
@@ -96,7 +101,7 @@
 
 platform darwin 8 {
     pre-fetch {
-        if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31] || [variant_isset llvm32]} {
+        if {${llvm_version} != ""} {
             if {![file exists ${prefix}/bin/llvm-config-mp-${llvm_version}]} {
                 ui_error "You must first install ld64 without llvm support to build llvm.  After llvm is installed, you can reinstall ld64 with the llvm variant."
                 return -code error "You must first install ld64 without llvm support to build llvm.  After llvm is installed, you can reinstall ld64 with the llvm variant."
@@ -164,7 +169,7 @@
     PREFIX=${prefix}
 
 pre-build {
-    if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31]  || [variant_isset llvm32]} {
+    if {${llvm_version} != ""} {
         build.args-append LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version}
     }
 
@@ -179,7 +184,7 @@
     file mkdir ${destroot}${prefix}/libexec/ld64
     file copy ${destroot}${prefix}/bin/ld ${destroot}${prefix}/libexec/ld64/ld
 
-    if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31] || [variant_isset llvm32]} {
+    if {${llvm_version} != ""} {
         system "install_name_tool -change ${prefix}/libexec/llvm-${llvm_version}/lib/libLTO.dylib \
                 @executable_path/../lib/libLTO.dylib ${destroot}${prefix}/libexec/ld64/ld"
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130210/dbc13917/attachment.html>