[152081] trunk/dports/devel
jeremyhu at macports.org
jeremyhu at macports.org
Sun Aug 28 19:45:08 PDT 2016
Revision: 152081
https://trac.macports.org/changeset/152081
Author: jeremyhu at macports.org
Date: 2016-08-28 19:45:08 -0700 (Sun, 28 Aug 2016)
Log Message:
-----------
{cctools,ld64}: Don't declare llvm33 and llvm34 variants on newer systems
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
trunk/dports/devel/ld64/Portfile
trunk/dports/devel/wiggle/Portfile
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2016-08-29 00:56:56 UTC (rev 152080)
+++ trunk/dports/devel/cctools/Portfile 2016-08-29 02:45:08 UTC (rev 152081)
@@ -58,50 +58,44 @@
}
set llvm_version {}
-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"
+if {${os.platform} eq "darwin" && ${os.major} < 10} {
+ 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}
}
}
-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"
+if {${os.platform} eq "darwin" && ${os.major} < 11} {
+ 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}
}
}
-variant llvm38 conflicts llvm33 llvm34 llvm39 llvmdev description {Use llvm-3.8 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
+variant llvm38 conflicts llvm39 llvmdev description {Use llvm-3.8 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
set llvm_version 3.8
depends_lib-append port:llvm-${llvm_version}
}
-variant llvm39 conflicts llvm33 llvm34 llvm38 llvmdev description {Use llvm-3.9 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
+variant llvm39 conflicts llvm38 llvmdev description {Use llvm-3.9 for libLTO, llvm-mc, llvm-size, and llvm-nm} {
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, llvm-mc, llvm-size, and llvm-nm} {
+variant llvmdev conflicts 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}
}
+set has_llvm_nm true
+set has_llvm_size true
+
+if {${llvm_version} == 3.3 || ${llvm_version} == 3.4} {
+ set has_llvm_nm false
+ set has_llvm_size false
+}
+
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-29 00:56:56 UTC (rev 152080)
+++ trunk/dports/devel/ld64/Portfile 2016-08-29 02:45:08 UTC (rev 152081)
@@ -285,37 +285,32 @@
}
set llvm_version {}
- 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}
- if {${os.major} >= 10} {
- ui_error "The +llvm33 variant is not supported on Snow Leopard and later."
- error "Invalid variant selected"
+ if {${os.platform} eq "darwin" && ${os.major} < 10} {
+ 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}
}
}
- 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}
-
- if {${os.major} >= 11} {
- ui_error "The +llvm34 variant is not supported on Lion and later."
- error "Invalid variant selected"
+ if {${os.platform} eq "darwin" && ${os.major} < 11} {
+ 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}
}
}
- variant llvm38 conflicts llvm33 llvm34 llvm39 llvmdev description {Use llvm-3.8 for libLTO} {
+ variant llvm38 conflicts 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 llvmdev description {Use llvm-3.9 for libLTO} {
+ variant llvm39 conflicts 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} {
+ variant llvmdev conflicts llvm38 llvm39 description {Use llvm-devel for libLTO} {
set llvm_version devel
depends_lib-append port:llvm-${llvm_version}
}
Modified: trunk/dports/devel/wiggle/Portfile
===================================================================
--- trunk/dports/devel/wiggle/Portfile 2016-08-29 00:56:56 UTC (rev 152080)
+++ trunk/dports/devel/wiggle/Portfile 2016-08-29 02:45:08 UTC (rev 152081)
@@ -4,7 +4,7 @@
PortSystem 1.0
PortGroup github 1.0
-github.setup neilbrown wiggle eac35c077388
+github.setup neilbrown wiggle 2fc27c653d96394682bdc79c0462fdeac42ee85b
version 1.0
revision 5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160828/dd81ce17/attachment-0001.html>
More information about the macports-changes
mailing list