[152009] trunk/dports/devel
jeremyhu at macports.org
jeremyhu at macports.org
Fri Aug 26 13:45:40 PDT 2016
Revision: 152009
https://trac.macports.org/changeset/152009
Author: jeremyhu at macports.org
Date: 2016-08-26 13:45:39 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
{cctools,ld64}: Re-add +llvm33 variant and make it default on Leopard to break dependency cycle (#52091)
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
trunk/dports/devel/ld64/Portfile
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2016-08-26 19:55:04 UTC (rev 152008)
+++ trunk/dports/devel/cctools/Portfile 2016-08-26 20:45:39 UTC (rev 152009)
@@ -46,33 +46,41 @@
patchfiles-append snowleopard-strnlen.patch
}
-if {![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ![variant_isset llvm37] && ![variant_isset llvm38] && ![variant_isset llvm39]} {
+if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ![variant_isset llvm37] && ![variant_isset llvm38] && ![variant_isset llvm39]} {
if {${os.major} >= 13} {
default_variants +llvm38
+ } elseif {${os.major} >= 10} {
+ default_variants +llvm34
} elseif {${os.major} >= 9} {
- default_variants +llvm34
+ # Using llvm-3.3 to break dependency cycle (https://trac.macports.org/ticket/52091)
+ default_variants +llvm33
}
}
set llvm_version {}
set has_llvm_nm false
set has_llvm_size false
-variant llvm34 conflicts llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.4 for libLTO and llvm-mc} {
+variant llvm33 conflicts llvm34 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.3 for libLTO and llvm-mc} {
+ set llvm_version 3.3
+ depends_lib-append port:llvm-${llvm_version}
+}
+
+variant llvm34 conflicts llvm33 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.4 for libLTO and llvm-mc} {
set llvm_version 3.4
depends_lib-append port:llvm-${llvm_version}
}
-variant llvm35 conflicts llvm34 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.5 for libLTO and llvm-mc} {
+variant llvm35 conflicts llvm33 llvm34 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.5 for libLTO and llvm-mc} {
set llvm_version 3.5
depends_lib-append port:llvm-${llvm_version}
}
-variant llvm36 conflicts llvm34 llvm35 llvm37 llvm38 llvm39 description {Use llvm-3.6 for libLTO and llvm-mc} {
+variant llvm36 conflicts llvm33 llvm34 llvm35 llvm37 llvm38 llvm39 description {Use llvm-3.6 for libLTO and llvm-mc} {
set llvm_version 3.6
depends_lib-append port:llvm-${llvm_version}
}
-variant llvm37 conflicts llvm34 llvm35 llvm36 llvm38 llvm39 description {Use llvm-3.7 for libLTO and llvm-mc} {
+variant llvm37 conflicts llvm33 llvm34 llvm35 llvm36 llvm38 llvm39 description {Use llvm-3.7 for libLTO and llvm-mc} {
set llvm_version 3.7
# llvm-3.7 does have llvm-nm, but it's not compatible.
@@ -82,14 +90,14 @@
depends_lib-append port:llvm-${llvm_version}
}
-variant llvm38 conflicts llvm34 llvm35 llvm36 llvm37 llvm39 description {Use llvm-3.8 for libLTO and llvm-mc} {
+variant llvm38 conflicts llvm33 llvm34 llvm35 llvm36 llvm37 llvm39 description {Use llvm-3.8 for libLTO and llvm-mc} {
set llvm_version 3.8
set has_llvm_nm true
set has_llvm_size true
depends_lib-append port:llvm-${llvm_version}
}
-variant llvm39 conflicts llvm34 llvm35 llvm36 llvm37 llvm38 description {Use llvm-3.9 for libLTO and llvm-mc} {
+variant llvm39 conflicts llvm33 llvm34 llvm35 llvm36 llvm37 llvm38 description {Use llvm-3.9 for libLTO and llvm-mc} {
set llvm_version 3.9
set has_llvm_nm true
set has_llvm_size true
Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile 2016-08-26 19:55:04 UTC (rev 152008)
+++ trunk/dports/devel/ld64/Portfile 2016-08-26 20:45:39 UTC (rev 152009)
@@ -268,46 +268,54 @@
# wanting LTO support in ld64 on Tiger can install the +llvm variant after llvm
# has been installed.
- if {![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ![variant_isset llvm37] && ![variant_isset llvm38] && ![variant_isset llvm39]} {
+ if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ![variant_isset llvm37] && ![variant_isset llvm38] && ![variant_isset llvm39]} {
if {${os.major} >= 13} {
default_variants +llvm38
+ } elseif {${os.major} >= 10} {
+ default_variants +llvm34
} elseif {${os.major} >= 9} {
- default_variants +llvm34
+ # Using llvm-3.3 to break dependency cycle (https://trac.macports.org/ticket/52091)
+ default_variants +llvm33
}
- if {![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ![variant_isset llvm37] && ![variant_isset llvm38] && ![variant_isset llvm39] && ${os.major} >= 9} {
+ if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm35] && ![variant_isset llvm36] && ![variant_isset llvm37] && ![variant_isset llvm38] && ![variant_isset llvm39] && ${os.major} >= 9} {
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."
}
}
set llvm_version {}
- variant llvm34 conflicts llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.4 for libLTO} {
+ variant llvm33 conflicts llvm34 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.3 for libLTO} {
+ set llvm_version 3.3
+ depends_lib-append port:llvm-${llvm_version}
+ }
+
+ variant llvm34 conflicts llvm33 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.4 for libLTO} {
set llvm_version 3.4
depends_lib-append port:llvm-${llvm_version}
}
- variant llvm35 conflicts llvm34 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.5 for libLTO} {
+ variant llvm35 conflicts llvm33 llvm34 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.5 for libLTO} {
set llvm_version 3.5
depends_lib-append port:llvm-${llvm_version}
}
- variant llvm36 conflicts llvm34 llvm35 llvm37 llvm38 llvm39 description {Use llvm-3.6 for libLTO} {
+ variant llvm36 conflicts llvm33 llvm34 llvm35 llvm37 llvm38 llvm39 description {Use llvm-3.6 for libLTO} {
set llvm_version 3.6
depends_lib-append port:llvm-${llvm_version}
}
- variant llvm37 conflicts llvm34 llvm35 llvm36 llvm38 llvm39 description {Use llvm-3.7 for libLTO} {
+ variant llvm37 conflicts llvm33 llvm34 llvm35 llvm36 llvm38 llvm39 description {Use llvm-3.7 for libLTO} {
set llvm_version 3.7
depends_lib-append port:llvm-${llvm_version}
}
- variant llvm38 conflicts llvm34 llvm35 llvm36 llvm37 llvm39 description {Use llvm-3.8 for libLTO} {
+ variant llvm38 conflicts llvm33 llvm34 llvm35 llvm36 llvm37 llvm39 description {Use llvm-3.8 for libLTO} {
set llvm_version 3.8
depends_lib-append port:llvm-${llvm_version}
}
- variant llvm39 conflicts llvm34 llvm35 llvm36 llvm37 llvm38 description {Use llvm-3.9 for libLTO} {
+ variant llvm39 conflicts llvm33 llvm34 llvm35 llvm36 llvm37 llvm38 description {Use llvm-3.9 for libLTO} {
set llvm_version 3.9
depends_lib-append port:llvm-${llvm_version}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160826/58f4f9ad/attachment.html>
More information about the macports-changes
mailing list