<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/e43ac6fe071206a0346ed5f05a7686f1735c12e9">https://github.com/macports/macports-ports/commit/e43ac6fe071206a0346ed5f05a7686f1735c12e9</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 e43ac6f qmake5-1.0.tcl: compensate for future error in Qt 5.7.1
</span>e43ac6f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e43ac6fe071206a0346ed5f05a7686f1735c12e9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 29 12:26:26 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> qmake5-1.0.tcl: compensate for future error in Qt 5.7.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> a change in Qt 5.7.1 made it more difficult to override sdk variables
</span><span style='display:block; white-space:pre;color:#404040;'> see https://codereview.qt-project.org/#/c/165499/
</span><span style='display:block; white-space:pre;color:#404040;'> see https://bugreports.qt.io/browse/QTBUG-56965
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 13 +++++++++++++
1 file changed, 13 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 b1f69c9..294bd07 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;'>@@ -100,6 +100,19 @@ if {${configure.sdkroot} ne ""} {
</span> QMAKE_MAC_SDK=[string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# a change in Qt 5.7.1 made it more difficult to override sdk variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://codereview.qt-project.org/#/c/165499/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://bugreports.qt.io/browse/QTBUG-56965
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cache [open "${worksrcpath}/.qmake.cache" w 0644]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_MAC_SDK=[string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${cache}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # respect configure.compiler but still allow qmake to find correct Xcode clang based on SDK
if { ${configure.compiler} ne "clang" } {
configure.args-append \
</pre><pre style='margin:0'>
</pre>