[152011] trunk/dports/devel
jeremyhu at macports.org
jeremyhu at macports.org
Fri Aug 26 14:01:03 PDT 2016
Revision: 152011
https://trac.macports.org/changeset/152011
Author: jeremyhu at macports.org
Date: 2016-08-26 14:01:02 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
{cctools,ld64}: Drop support for +llvm35, +llvm36, and +llvm37 variants
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 20:58:16 UTC (rev 152010)
+++ trunk/dports/devel/cctools/Portfile 2016-08-26 21:01:02 UTC (rev 152011)
@@ -46,7 +46,7 @@
patchfiles-append snowleopard-strnlen.patch
}
-if {![variant_isset llvm33] && ![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 llvm38] && ![variant_isset llvm39]} {
if {${os.major} >= 13} {
default_variants +llvm38
} elseif {${os.major} >= 10} {
@@ -60,7 +60,7 @@
set llvm_version {}
set has_llvm_nm false
set has_llvm_size false
-variant llvm33 conflicts llvm34 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.3 for libLTO and llvm-mc} {
+variant llvm33 conflicts llvm34 llvm38 llvm39 description {Use llvm-3.3 for libLTO and llvm-mc} {
set llvm_version 3.3
depends_lib-append port:llvm-${llvm_version}
@@ -70,7 +70,7 @@
}
}
-variant llvm34 conflicts llvm33 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.4 for libLTO and llvm-mc} {
+variant llvm34 conflicts llvm33 llvm38 llvm39 description {Use llvm-3.4 for libLTO and llvm-mc} {
set llvm_version 3.4
depends_lib-append port:llvm-${llvm_version}
@@ -80,34 +80,14 @@
}
}
-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 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 llvm33 llvm34 llvm35 llvm36 llvm38 llvm39 description {Use llvm-3.7 for libLTO, llvm-mc, and llvm-size} {
- set llvm_version 3.7
-
- # llvm-3.7 does have llvm-nm, but it's not compatible.
- # See: https://trac.macports.org/ticket/51832
- #set has_llvm_nm true
- set has_llvm_size true
- depends_lib-append port:llvm-${llvm_version}
-}
-
-variant llvm38 conflicts llvm33 llvm34 llvm35 llvm36 llvm37 llvm39 description {Use llvm-3.8 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
+variant llvm38 conflicts llvm33 llvm34 llvm39 description {Use llvm-3.8 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
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 llvm33 llvm34 llvm35 llvm36 llvm37 llvm38 description {Use llvm-3.9 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
+variant llvm39 conflicts llvm33 llvm34 llvm38 description {Use llvm-3.9 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
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 20:58:16 UTC (rev 152010)
+++ trunk/dports/devel/ld64/Portfile 2016-08-26 21:01:02 UTC (rev 152011)
@@ -268,7 +268,7 @@
# wanting LTO support in ld64 on Tiger can install the +llvm variant after llvm
# has been installed.
- if {![variant_isset llvm33] && ![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 llvm38] && ![variant_isset llvm39]} {
if {${os.major} >= 13} {
default_variants +llvm38
} elseif {${os.major} >= 10} {
@@ -278,14 +278,14 @@
default_variants +llvm33
}
- 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} {
+ if {![variant_isset llvm33] && ![variant_isset llvm34] && ![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 llvm33 conflicts llvm34 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.3 for libLTO} {
+ variant llvm33 conflicts llvm34 llvm38 llvm39 description {Use llvm-3.3 for libLTO} {
set llvm_version 3.3
depends_lib-append port:llvm-${llvm_version}
@@ -295,7 +295,7 @@
}
}
- variant llvm34 conflicts llvm33 llvm35 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.4 for libLTO} {
+ variant llvm34 conflicts llvm33 llvm38 llvm39 description {Use llvm-3.4 for libLTO} {
set llvm_version 3.4
depends_lib-append port:llvm-${llvm_version}
@@ -305,27 +305,12 @@
}
}
- 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 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 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 llvm33 llvm34 llvm35 llvm36 llvm37 llvm39 description {Use llvm-3.8 for libLTO} {
+ variant llvm38 conflicts llvm33 llvm34 llvm39 description {Use llvm-3.8 for libLTO} {
set llvm_version 3.8
depends_lib-append port:llvm-${llvm_version}
}
- variant llvm39 conflicts llvm33 llvm34 llvm35 llvm36 llvm37 llvm38 description {Use llvm-3.9 for libLTO} {
+ variant llvm39 conflicts llvm33 llvm34 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/2c399220/attachment.html>
More information about the macports-changes
mailing list