<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/f40bb28239c4b86e2eda8263af951b66a70ac6e9">https://github.com/macports/macports-ports/commit/f40bb28239c4b86e2eda8263af951b66a70ac6e9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f40bb28239c4b86e2eda8263af951b66a70ac6e9
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Fri Sep 29 02:51:22 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5,qmake5 PG: whitespace changes
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 48 +++++++++++-----------
_resources/port1.0/group/qt5-1.0.tcl | 70 ++++++++++++++++-----------------
2 files changed, 59 insertions(+), 59 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 602c072..e297530 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;'>@@ -58,13 +58,13 @@ pre-configure {
</span> if {[vercmp ${qt5.version} 5.9]>=0} {
configure.args-append -spec ${qt_qmake_spec}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global merger_configure_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(i386) -spec ${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) -spec ${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -spec ${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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;'>+ global merger_configure_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) -spec ${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) -spec ${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,23 +96,23 @@ pre-configure {
</span> puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${build_arch}"
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><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><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><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} "if(${qt_qmake_spec_64}) {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} " QT_ARCH=x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} " QT_TARGET_ARCH=x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} " QMAKE_CFLAGS+=-arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} " QMAKE_CXXFLAGS+=-arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} " QMAKE_LFLAGS+=-arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} "} else {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} " QT_ARCH=i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} " QT_TARGET_ARCH=i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} "}"
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "if(${qt_qmake_spec_64}) {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} " QT_ARCH=x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} " QT_TARGET_ARCH=x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} " QMAKE_CFLAGS+=-arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} " QMAKE_CXXFLAGS+=-arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} " QMAKE_LFLAGS+=-arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "} else {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} " QT_ARCH=i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} " QT_TARGET_ARCH=i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "}"
</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 883e6fa..4b34ea0 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;'>@@ -591,7 +591,7 @@ if {[vercmp ${qt5.version} 5.10]>=0} {
</span> } else {
# no PPC support in Qt 5
# see http://lists.qt-project.org/pipermail/interest/2012-December/005038.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default supported_archs {"i386 x86_64"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default supported_archs {"i386 x86_64"}
</span> }
if {[vercmp ${qt5.version} 5.9]>=0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -603,44 +603,44 @@ if {[vercmp ${qt5.version} 5.9]>=0} {
</span>
destroot.env-append INSTALL_ROOT=${destroot}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# no universal binary support in Qt 5 versions < 5.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see http://lists.qt-project.org/pipermail/interest/2012-December/005038.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and https://bugreports.qt.io/browse/QTBUG-24952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# override universal_setup found in portutil.tcl so it uses muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/51643
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc universal_setup {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "universal variant already exists, so not adding the default one"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[exists universal_variant] && ![option universal_variant]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "universal_variant is false, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[exists use_xmkmf] && [option use_xmkmf]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using xmkmf, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![exists os.universal_supported] || ![option os.universal_supported]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "OS doesn't support universal builds, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[llength [option supported_archs]] == 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "only one arch supported, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "adding universal variant via PortGroup muniversal"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uplevel "PortGroup muniversal 1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uplevel "default universal_archs_supported {\"i386 x86_64\"}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no universal binary support in Qt 5 versions < 5.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://lists.qt-project.org/pipermail/interest/2012-December/005038.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and https://bugreports.qt.io/browse/QTBUG-24952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # override universal_setup found in portutil.tcl so it uses muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/51643
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc universal_setup {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "universal variant already exists, so not adding the default one"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[exists universal_variant] && ![option universal_variant]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "universal_variant is false, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[exists use_xmkmf] && [option use_xmkmf]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using xmkmf, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {![exists os.universal_supported] || ![option os.universal_supported]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "OS doesn't support universal builds, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[llength [option supported_archs]] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "only one arch supported, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "adding universal variant via PortGroup muniversal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uplevel "PortGroup muniversal 1.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uplevel "default universal_archs_supported {\"i386 x86_64\"}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# standard destroot environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global merger_destroot_env
</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;'>- destroot.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_ROOT=${destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_env($arch) INSTALL_ROOT=${workpath}/destroot-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # standard destroot environment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global merger_destroot_env
</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;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_ROOT=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env($arch) INSTALL_ROOT=${workpath}/destroot-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_qmake_spec_32 macx-clang-32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_qmake_spec_64 macx-clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_qmake_spec_32 macx-clang-32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_qmake_spec_64 macx-clang
</span> }
default qt_qmake_spec {[qt5pg::get_default_spec]}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -655,7 +655,7 @@ namespace eval qt5pg {
</span> return ${qt_qmake_spec_64}
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${qt_qmake_spec_64}
</span> }
}
}
</pre><pre style='margin:0'>
</pre>