[152012] trunk/dports/devel
jeremyhu at macports.org
jeremyhu at macports.org
Fri Aug 26 14:11:52 PDT 2016
Revision: 152012
https://trac.macports.org/changeset/152012
Author: jeremyhu at macports.org
Date: 2016-08-26 14:11:52 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
{cctools,ld64}: Add +llvmdev variant
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 21:01:02 UTC (rev 152011)
+++ trunk/dports/devel/cctools/Portfile 2016-08-26 21:11:52 UTC (rev 152012)
@@ -46,7 +46,7 @@
patchfiles-append snowleopard-strnlen.patch
}
-if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm38] && ![variant_isset llvm39]} {
+if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm38] && ![variant_isset llvm39] && ![variant_isset llvmdev]} {
if {${os.major} >= 13} {
default_variants +llvm38
} elseif {${os.major} >= 10} {
@@ -58,42 +58,50 @@
}
set llvm_version {}
-set has_llvm_nm false
-set has_llvm_size false
-variant llvm33 conflicts llvm34 llvm38 llvm39 description {Use llvm-3.3 for libLTO and llvm-mc} {
+set has_llvm_nm true
+set has_llvm_size true
+
+variant llvm33 conflicts llvm34 llvm38 llvm39 llvmdev description {Use llvm-3.3 for libLTO and llvm-mc} {
set llvm_version 3.3
depends_lib-append port:llvm-${llvm_version}
+ set has_llvm_nm false
+ set has_llvm_size false
+
if {${os.major} >= 10} {
ui_error "The +llvm33 variant is not supported on Snow Leopard and later."
error "Invalid variant selected"
}
}
-variant llvm34 conflicts llvm33 llvm38 llvm39 description {Use llvm-3.4 for libLTO and llvm-mc} {
+variant llvm34 conflicts llvm33 llvm38 llvm39 llvmdev description {Use llvm-3.4 for libLTO and llvm-mc} {
set llvm_version 3.4
depends_lib-append port:llvm-${llvm_version}
+ set has_llvm_nm false
+ set has_llvm_size false
+
if {${os.major} >= 11} {
ui_error "The +llvm34 variant is not supported on Lion and later."
error "Invalid variant selected"
}
}
-variant llvm38 conflicts llvm33 llvm34 llvm39 description {Use llvm-3.8 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
+variant llvm38 conflicts llvm33 llvm34 llvm39 llvmdev 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 llvm38 description {Use llvm-3.9 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
+variant llvm39 conflicts llvm33 llvm34 llvm38 llvmdev 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
depends_lib-append port:llvm-${llvm_version}
}
+variant llvmdev conflicts llvm33 llvm34 llvm38 llvm39 description {Use llvm-devel for libLTO, llvm-mc, llvm-size, and llvm-nm} {
+ set llvm_version devel
+ depends_lib-append port:llvm-${llvm_version}
+}
+
use_configure no
destroot.args RAW_DSTROOT=${destroot} DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile 2016-08-26 21:01:02 UTC (rev 152011)
+++ trunk/dports/devel/ld64/Portfile 2016-08-26 21:11:52 UTC (rev 152012)
@@ -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 llvm38] && ![variant_isset llvm39]} {
+ if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm38] && ![variant_isset llvm39] && ![variant_isset llvmdev]} {
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 llvm38] && ![variant_isset llvm39] && ${os.major} >= 9} {
+ if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm38] && ![variant_isset llvm39] && ![variant_isset llvmdev] && ${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 llvm38 llvm39 description {Use llvm-3.3 for libLTO} {
+ variant llvm33 conflicts llvm34 llvm38 llvm39 llvmdev 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 llvm38 llvm39 description {Use llvm-3.4 for libLTO} {
+ variant llvm34 conflicts llvm33 llvm38 llvm39 llvmdev description {Use llvm-3.4 for libLTO} {
set llvm_version 3.4
depends_lib-append port:llvm-${llvm_version}
@@ -305,16 +305,21 @@
}
}
- variant llvm38 conflicts llvm33 llvm34 llvm39 description {Use llvm-3.8 for libLTO} {
+ variant llvm38 conflicts llvm33 llvm34 llvm39 llvmdev description {Use llvm-3.8 for libLTO} {
set llvm_version 3.8
depends_lib-append port:llvm-${llvm_version}
}
- variant llvm39 conflicts llvm33 llvm34 llvm38 description {Use llvm-3.9 for libLTO} {
+ variant llvm39 conflicts llvm33 llvm34 llvm38 llvmdev description {Use llvm-3.9 for libLTO} {
set llvm_version 3.9
depends_lib-append port:llvm-${llvm_version}
}
+ variant llvmdev conflicts llvm33 llvm34 llvm38 llvm39 description {Use llvm-devel for libLTO} {
+ set llvm_version devel
+ depends_lib-append port:llvm-${llvm_version}
+ }
+
if {${os.major} < 10} {
# Leopard and earlier didn't have libunwind.h in the SDK
depends_build-append path:include/libunwind.h:libunwind-headers
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160826/e44a2989/attachment.html>
More information about the macports-changes
mailing list