<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c52f70495f83e8b9e09bf3e362046998cf01240b">https://github.com/macports/macports-ports/commit/c52f70495f83e8b9e09bf3e362046998cf01240b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c52f704 qt5 PG: postpone evaluation of qt_qmake_spec
</span>c52f704 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c52f70495f83e8b9e09bf3e362046998cf01240b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 13:33:23 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: postpone evaluation of qt_qmake_spec
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
<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 5b8b437..00f4d15 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;'>@@ -279,22 +279,28 @@ proc universal_setup {args} {
</span> # other platforms required
# see http://doc.qt.io/qt-5/supported-platforms.html
# and http://doc.qt.io/QtSupportedPlatforms/index.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-global qt_qmake_spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt_qmake_spec
</span> global qt_qmake_spec_32
global qt_qmake_spec_64
compiler.blacklist-append *gcc*
set qt_qmake_spec_32 macx-clang-32
set qt_qmake_spec_64 macx-clang
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt_qmake_spec {[qt5pg::get_default_spec]}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ![option universal_variant] || ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_qmake_spec ${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_qmake_spec ${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+namespace eval qt5pg {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc get_default_spec {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.build_arch qt_qmake_spec_32 qt_qmake_spec_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![option universal_variant] || ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.build_arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_qmake_spec ""
</span> }
# use PKGCONFIG for Qt discovery in configure scripts
</pre><pre style='margin:0'>
</pre>