[152010] trunk/dports/devel

[jeremyhu at macports.org]

Revision: 152010
          https://trac.macports.org/changeset/152010
Author:   jeremyhu at macports.org
Date:     2016-08-26 13:58:16 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
{cctools,ld64}: Error out if trying to use +llvm33 or +llvm34 on newer OS versions that don't need them for bootstrapping

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:45:39 UTC (rev 152009)
+++ trunk/dports/devel/cctools/Portfile	2016-08-26 20:58:16 UTC (rev 152010)
@@ -63,11 +63,21 @@
 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}
+
+    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 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}
+
+    if {${os.major} >= 11} {
+        ui_error "The +llvm34 variant is not supported on Lion and later."
+        error "Invalid variant selected"
+    }
 }
 
 variant llvm35 conflicts llvm33 llvm34 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.5 for libLTO and llvm-mc} {
@@ -80,7 +90,7 @@
     depends_lib-append      port:llvm-${llvm_version}
 }
 
-variant llvm37 conflicts llvm33 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, llvm-mc, and llvm-size} {
     set llvm_version        3.7
 
     # llvm-3.7 does have llvm-nm, but it's not compatible.
@@ -90,14 +100,14 @@
     depends_lib-append      port:llvm-${llvm_version}
 }
 
-variant llvm38 conflicts llvm33 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, 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 and llvm-mc} {
+variant llvm39 conflicts llvm33 llvm34 llvm35 llvm36 llvm37 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:45:39 UTC (rev 152009)
+++ trunk/dports/devel/ld64/Portfile	2016-08-26 20:58:16 UTC (rev 152010)
@@ -288,11 +288,21 @@
     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}
+
+        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 llvm35 llvm36 llvm37 llvm38 llvm39 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"
+        }
     }
 
     variant llvm35 conflicts llvm33 llvm34 llvm36 llvm37 llvm38 llvm39 description {Use llvm-3.5 for libLTO} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160826/04caa158/attachment-0001.html>