[107751] trunk/dports/devel
jeremyhu at macports.org
jeremyhu at macports.org
Thu Jul 4 23:34:14 PDT 2013
Revision: 107751
https://trac.macports.org/changeset/107751
Author: jeremyhu at macports.org
Date: 2013-07-04 23:34:14 -0700 (Thu, 04 Jul 2013)
Log Message:
-----------
{cctools,ld64}: Add +llvm34 variant and make +llvm33 default
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
trunk/dports/devel/ld64/Portfile
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2013-07-05 06:01:29 UTC (rev 107750)
+++ trunk/dports/devel/cctools/Portfile 2013-07-05 06:34:14 UTC (rev 107751)
@@ -46,36 +46,41 @@
supported_archs i386 x86_64
}
-if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ${os.major} >= 9} {
- default_variants +llvm32
+if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ![variant_isset llvm33] && ${os.major} >= 9} {
+ default_variants +llvm33
}
set llvm_version {}
-variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 description {Use llvm-2.9 for libLTO and llvm-mc} {
+variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 llvm34 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 llvm33 description {Use llvm-3.0 for libLTO and llvm-mc} {
+variant llvm30 conflicts llvm29 llvm31 llvm32 llvm33 llvm34 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 llvm33 description {Use llvm-3.1 for libLTO and llvm-mc} {
+variant llvm31 conflicts llvm29 llvm30 llvm32 llvm33 llvm34 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 llvm33 description {Use llvm-3.2 for libLTO and llvm-mc} {
+variant llvm32 conflicts llvm29 llvm30 llvm31 llvm33 llvm34 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} {
+variant llvm33 conflicts llvm29 llvm30 llvm31 llvm32 llvm34 description {Use llvm-3.3 for libLTO and llvm-mc} {
set llvm_version 3.3
depends_run-append port:llvm-${llvm_version}
}
+variant llvm34 conflicts llvm29 llvm30 llvm31 llvm32 llvm33 description {Use llvm-3.4 for libLTO and llvm-mc} {
+ set llvm_version 3.4
+ 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 2013-07-05 06:01:29 UTC (rev 107750)
+++ trunk/dports/devel/ld64/Portfile 2013-07-05 06:34:14 UTC (rev 107751)
@@ -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] && ![variant_isset llvm33] && ${os.major} >= 9} {
- default_variants +llvm32
+if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ![variant_isset llvm34] && ${os.major} >= 9} {
+ default_variants +llvm33
# Leopard/powerpc has the option to not be LTO
- if {![variant_isset llvm32] && ${os.arch} != "powerpc"} {
+ if {![variant_isset llvm33] && ${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,31 +44,36 @@
variant universal {}
set llvm_version {}
-variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 description {Use llvm-2.9 for libLTO} {
+variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 llvm34 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 llvm33 description {Use llvm-3.0 for libLTO} {
+variant llvm30 conflicts llvm29 llvm31 llvm32 llvm33 llvm34 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 llvm33 description {Use llvm-3.1 for libLTO} {
+variant llvm31 conflicts llvm29 llvm30 llvm32 llvm33 llvm34 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 llvm33 description {Use llvm-3.2 for libLTO} {
+variant llvm32 conflicts llvm29 llvm30 llvm31 llvm33 llvm34 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} {
+variant llvm33 conflicts llvm29 llvm30 llvm31 llvm32 llvm34 description {Use llvm-3.3 for libLTO} {
set llvm_version 3.3
depends_lib-append port:llvm-${llvm_version}
}
+variant llvm34 conflicts llvm29 llvm30 llvm31 llvm32 llvm33 description {Use llvm-3.4 for libLTO} {
+ set llvm_version 3.4
+ depends_lib-append port:llvm-${llvm_version}
+}
+
set makefile "Makefile-133"
if {${os.arch} == "powerpc" || ${os.major} < 9} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130704/1af4ecbe/attachment.html>
More information about the macports-changes
mailing list