Ticket #52118: Portfile.diff

Portfile

@@ -263 +263 @@
         depends_build-append port:cctools
     }
 
+    set all_llvm_variants {llvm38 llvm39 llvmdev}
+    if {${os.major} < 10} {
+        lappend all_llvm_variants llvm33
+    }
+    if {${os.major} < 11} {
+        lappend all_llvm_variants llvm34
+    }
+    array set llvm_variant_version {llvm33 3.3 llvm34 3.4 llvm38 3.8 llvm39 3.9 llvmdev devel}
+    set llvm_version {}
+
+    foreach variantname $all_llvm_variants {
+        set this_llvm_version $llvm_variant_version($variantname)
+        variant $variantname conflicts [ldelete $all_llvm_variants $variantname] description "Use llvm-${this_llvm_version} for libLTO" "
+            set llvm_version        $this_llvm_version
+            depends_lib-append      port:llvm-${this_llvm_version}
+        "
+    }
+
+    proc some_llvm_variant_set {} {
+        global all_llvm_variants
+        foreach variantname $all_llvm_variants {
+            if {[variant_isset $variantname]} {
+                return yes
+            }
+        }
+        return no
+    }
+
     # We don't set llvmXX as the default variant on Tiger because it would introduce a
     # dependency cycle as llvm requires apple-gcc42 and ld64 to build correctly.  Users
     # 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] && ![variant_isset llvmdev]} {
+    if {![some_llvm_variant_set]} {
         if {${os.major} >= 13} {
             default_variants +llvm38
         } elseif {${os.major} >= 10} {
@@ -278 +306 @@
             default_variants +llvm33
         }
 
-        if {![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm38] && ![variant_isset llvm39] && ![variant_isset llvmdev] && ${os.major} >= 9} {
+        if {![some_llvm_variant_set] && ${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 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"
-        }
-    }
-
-    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"
-        }
-    }
-
-    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 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