<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/073f0df6e6a1ab6aae18e6b821a755535598ced1">https://github.com/macports/macports-ports/commit/073f0df6e6a1ab6aae18e6b821a755535598ced1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 073f0df6e6a1ab6aae18e6b821a755535598ced1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 27 10:09:43 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> qmake5-1.0.tcl: do not assume qt5-qtbase is providing qmake
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
<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 c6d9fcf..8531f08 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;'>@@ -126,11 +126,21 @@ if {![info exists qt5_qmake_request_no_debug]} {
</span> # accommodating variant request varies depending on how qtbase was built
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine if qmake builds debug libraries by default (set via variants)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants qt5-qtbase debug ""]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_debug true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_debug false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set base_debug false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach qt_test_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants ${qt_test_name}-qtbase debug ""]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # code to be executed if $depspec is active with at least all variants in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $required and none from $forbidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set base_debug true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # code to be executed if $depspec is active, but either not with all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # variants in $required or any variant in $forbidden
</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;'>+ # code to be executed if $depspec isn't active
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# determine if the user wants to build debug libraries
</pre><pre style='margin:0'>
</pre>