[144788] trunk/dports/aqua/qt5/Portfile

mcalhoun at macports.org mcalhoun at macports.org
Mon Jan 18 07:21:02 PST 2016


Revision: 144788
          https://trac.macports.org/changeset/144788
Author:   mcalhoun at macports.org
Date:     2016-01-18 07:21:02 -0800 (Mon, 18 Jan 2016)
Log Message:
-----------
qt5: move warning code so that variables from qt5 PortGroup are actually defined (r144784 was an error)
has the side effect of only warning for qt5-qtbase and not other qt5 subports

Revision Links:
--------------
    https://trac.macports.org/changeset/144784

Modified Paths:
--------------
    trunk/dports/aqua/qt5/Portfile

Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- trunk/dports/aqua/qt5/Portfile	2016-01-18 15:18:27 UTC (rev 144787)
+++ trunk/dports/aqua/qt5/Portfile	2016-01-18 15:21:02 UTC (rev 144788)
@@ -47,40 +47,6 @@
     use_xz yes
 }
 
-if { ${os.platform} ne "darwin" } {
-    pre-fetch {
-        ui_warn "${subport} is untested on \"${os.platform}\"."
-    }
-} elseif { ${os.major} < ${qt5_min_tested_version} } {
-    pre-fetch {
-        ui_error "OS X prior to 10.8 (Mountain Lion) is not a Reference Configuration for Qt."
-        ui_error "OS X prior to 10.7 (Lion) is not even tested."
-        ui_error "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
-        return -code error "unsupported OS"
-    }
-} elseif { ${os.major} > ${qt5_max_reference_version} } {
-    pre-fetch {
-        ui_warn "OS X subsequent to 10.10 (Yosemite) is not a Reference Configuration for Qt."
-        ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
-    }
-} else {
-    # ${qt5_min_tested_version} <= ${os.major} <= ${qt5_max_reference_version}
-}
-
-if { [variant_isset universal] } {
-    pre-fetch {
-        ui_warn "Multiple architectures is not a Reference Configuration for Qt."
-        ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
-    }
-} else {
-    if { ${configure.build_arch} eq "i386" } {
-        pre-fetch {
-            ui_warn "32-bit mode is not a Reference Configuration for Qt."
-            ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
-        }
-    }
-}
-
 ############################################################################### Modules Not Considered
 #
 # No qt5             (Doesn't Install Anything)
@@ -851,6 +817,39 @@
     PortGroup           xcodeversion 1.0
     PortGroup           cxx11 1.0
 
+    if { ${os.platform} ne "darwin" } {
+        pre-fetch {
+            ui_warn "${subport} is untested on \"${os.platform}\"."
+        }
+    } elseif { ${os.major} < ${qt5_min_tested_version} } {
+        pre-fetch {
+            ui_error "OS X prior to 10.8 (Mountain Lion) is not a Reference Configuration for Qt."
+            ui_error "OS X prior to 10.7 (Lion) is not even tested."
+            ui_error "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
+            return -code error "unsupported OS"
+        }
+    } elseif { ${os.major} > ${qt5_max_reference_version} } {
+        pre-fetch {
+            ui_warn "OS X subsequent to 10.10 (Yosemite) is not a Reference Configuration for Qt."
+            ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
+        }
+    } else {
+        # ${qt5_min_tested_version} <= ${os.major} <= ${qt5_max_reference_version}
+    }
+    if { [variant_isset universal] } {
+        pre-fetch {
+            ui_warn "Multiple architectures is not a Reference Configuration for Qt."
+            ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
+        }
+    } else {
+        if { ${configure.build_arch} eq "i386" } {
+            pre-fetch {
+                ui_warn "32-bit mode is not a Reference Configuration for Qt."
+                ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
+            }
+        }
+    }
+
     conflicts           qt3 qt3-mac
 
     minimum_xcodeversions   {11 4.3}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160118/35e61e2f/attachment-0001.html>


More information about the macports-changes mailing list