[92180] trunk/dports/devel

[jeremyhu at macports.org]

Revision: 92180
          https://trac.macports.org/changeset/92180
Author:   jeremyhu at macports.org
Date:     2012-04-21 01:59:34 -0700 (Sat, 21 Apr 2012)
Log Message:
-----------
{cctools,ld64}: Provide variants for choosing which version of llvm to use for LTO

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

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2012-04-21 08:36:21 UTC (rev 92179)
+++ trunk/dports/devel/cctools/Portfile	2012-04-21 08:59:34 UTC (rev 92180)
@@ -5,7 +5,6 @@
 # XCode 4.3
 version                 822
 revision                2
-set llvm_version        3.0
 categories              devel
 platforms               darwin
 maintainers             mfeiri jeremyhu openmaintainer
@@ -23,7 +22,6 @@
 
 depends_lib             port:cctools-headers
 depends_build           path:lib/libprunetrie.a:ld64
-depends_run             port:llvm-${llvm_version}
 
 patchfiles              PR-11136237.patch lto.patch
 
@@ -55,6 +53,26 @@
     supported_archs     i386 x86_64
 }
 
+if {![variant_isset llvm-2.9] && ![variant_isset llvm-3.0] && ![variant_isset llvm-3.1]} {
+    default_variants +llvm-3.0
+}
+
+set llvm_version {}
+variant llvm29 conflicts llvm30 llvm31 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 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 description {Use llvm-3.1 for libLTO and llvm-mc} {
+    set llvm_version        3.1
+    depends_run-append      port:llvm-${llvm_version}
+}
+
 use_configure           no
 destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
 

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2012-04-21 08:36:21 UTC (rev 92179)
+++ trunk/dports/devel/ld64/Portfile	2012-04-21 08:59:34 UTC (rev 92180)
@@ -18,7 +18,7 @@
 homepage                http://opensource.apple.com/source/${name}/
 master_sites            http://opensource.apple.com/tarballs/${name}/
 license                 APSL-2.0
-depends_build           port:llvm-${llvm_version} port:libunwind-headers \
+depends_build           port:libunwind-headers \
                         path:include/mach-o/dyld_priv.h:dyld-headers \
                         path:include/mach-o/arm/reloc.h:cctools-headers
 description             ld64 is the new mach-o linker
@@ -29,6 +29,26 @@
                         rmd160  0da68b89669233d7b6cc6ebdb92482e191bc9051 \
                         sha256  96a912464e2d4d3d7cdaab0744003b0fa93d139f203c82867f659ee94b4ae9f7
 
+if {![variant_isset llvm-2.9] && ![variant_isset llvm-3.0] && ![variant_isset llvm-3.1]} {
+    default_variants +llvm-3.0
+}
+
+set llvm_version {}
+variant llvm29 conflicts llvm30 llvm31 description {Use llvm-2.9 for libLTO} {
+    set llvm_version        2.9
+    depends_lib-append      port:llvm-${llvm_version}
+}
+
+variant llvm30 conflicts llvm29 llvm31 description {Use llvm-3.0 for libLTO} {
+    set llvm_version        3.0
+    depends_lib-append      port:llvm-${llvm_version}
+}
+
+variant llvm31 conflicts llvm29 llvm30 description {Use llvm-3.1 for libLTO} {
+    set llvm_version        3.1
+    depends_lib-append      port:llvm-${llvm_version}
+}
+
 if {${os.major} < 9} {
     # XCode 2.5
     # Newer versions rely on too many changes which aren't really worth
@@ -40,6 +60,7 @@
                         sha256 82ccb66eb5a452b8bb47771ebbdb73bed7e8824e3cbd58fa2d6d6fc91ca26b87     
     supported_archs     i386 ppc
     depends_build
+    depends_lib
 
     patchfiles          ld64-62.1-dylib_version_args.patch ld64-62.1-version.patch
 } elseif {${os.arch} == "powerpc"} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120421/f769f6ae/attachment-0001.html>