<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/b6c02f348d15442c859d6a04094ef40e8cb46cb3">https://github.com/macports/macports-ports/commit/b6c02f348d15442c859d6a04094ef40e8cb46cb3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b6c02f348d15442c859d6a04094ef40e8cb46cb3
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Fri Sep 29 02:39:45 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qmake5 PG: rearrange comments
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 13 +++++++------
1 file changed, 7 insertions(+), 6 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 224c196..c87fa84 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;'>@@ -52,14 +52,8 @@ configure.universal_args-delete --disable-dependency-tracking
</span>
pre-configure {
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # set QT_ARCH and QT_TARGET_ARCH manually since they may be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # incorrect in ${qt_mkspecs_dir}/qconfig.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if qtbase was built universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span> # -spec specifies build configuration (compiler, 32-bit/64-bit, etc.)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # set -arch x86_64 since macx-clang spec file assumes it is the default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span> if { [tbool qt5.add_spec] } {
if {[variant_exists universal] && [variant_isset universal]} {
global merger_configure_args
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +85,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;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set QT_ARCH and QT_TARGET_ARCH manually since they may be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # incorrect in ${qt_mkspecs_dir}/qconfig.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if qtbase was built universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set -arch x86_64 since macx-clang spec file assumes it is the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span> puts ${cache} "if(${qt_qmake_spec_64}) {"
puts ${cache} " QT_ARCH=x86_64"
puts ${cache} " QT_TARGET_ARCH=x86_64"
</pre><pre style='margin:0'>
</pre>