<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d20ff16b5c8b14f2db5ec0d5650fd88dcd4e0e18">https://github.com/macports/macports-ports/commit/d20ff16b5c8b14f2db5ec0d5650fd88dcd4e0e18</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d20ff16b5c8b14f2db5ec0d5650fd88dcd4e0e18
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Fri Sep 29 02:42:27 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5,qmake5 PG: Qt 5.9 supports multiple architectures
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    For Qt >= 5.9, do not attempt to use muniversal PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'>    See http://web.archive.org/web/20170621174843/http://doc.qt.io/qt-5/osx.html
</span>---
 _resources/port1.0/group/qmake5-1.0.tcl | 12 ++++++++++++
 _resources/port1.0/group/qt5-1.0.tcl    | 11 +++++++++++
 2 files changed, 23 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c87fa84..602c072 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,9 @@ pre-configure {
</span>     # -spec specifies build configuration (compiler, 32-bit/64-bit, etc.)
     #
     if { [tbool qt5.add_spec] } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp ${qt5.version} 5.9]>=0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.args-append -spec ${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span>         if {[variant_exists universal] && [variant_isset universal]} {
             global merger_configure_args
             lappend merger_configure_args(i386)   -spec ${qt_qmake_spec_32}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +65,7 @@ pre-configure {
</span>         } else {
             configure.args-append -spec ${qt_qmake_spec}
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +89,13 @@ pre-configure {
</span>     #    do not pass on the configure.args values
     #
     set cache [open "${qt5.top_level}/.qmake.cache" w 0644]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[vercmp ${qt5.version} 5.9] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${configure.universal_archs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span>     #
     # set QT_ARCH and QT_TARGET_ARCH manually since they may be
     #     incorrect in ${qt_mkspecs_dir}/qconfig.pri
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,6 +113,7 @@ pre-configure {
</span>     puts ${cache} "  QT_ARCH=i386"
     puts ${cache} "  QT_TARGET_ARCH=i386"
     puts ${cache} "}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     puts ${cache} "QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}"
     puts ${cache} "QMAKE_MAC_SDK=macosx${configure.sdk_version}"
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 72a7d89..883e6fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -594,6 +594,15 @@ if {[vercmp ${qt5.version} 5.10]>=0} {
</span> default supported_archs {"i386 x86_64"}
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${qt5.version} 5.9]>=0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # in version 5.9, QT changed how it handles multiple architectures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see http://web.archive.org/web/20170621174843/http://doc.qt.io/qt-5/osx.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set qt_qmake_spec_32 macx-clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set qt_qmake_spec_64 macx-clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.env-append INSTALL_ROOT=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> # no universal binary support in Qt 5 versions < 5.9
 #     see http://lists.qt-project.org/pipermail/interest/2012-December/005038.html
 #     and https://bugreports.qt.io/browse/QTBUG-24952
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -632,6 +641,8 @@ pre-destroot {
</span> 
 set qt_qmake_spec_32 macx-clang-32
 set qt_qmake_spec_64 macx-clang
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default qt_qmake_spec {[qt5pg::get_default_spec]}
 
 namespace eval qt5pg {
</pre><pre style='margin:0'>

</pre>