<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/b0eed5b5f565333c18612186a0963aa8e6a6339b">https://github.com/macports/macports-ports/commit/b0eed5b5f565333c18612186a0963aa8e6a6339b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b0eed5b5f565333c18612186a0963aa8e6a6339b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 27 10:17:33 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5, qt55: minor simplification of code
</span>---
aqua/qt5/Portfile | 6 +-----
aqua/qt55/Portfile | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 715d6ef..d7b9395 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -616,10 +616,9 @@ foreach {module module_info} [array get modules] {
</span> # change default compiler flags for the purpose of building qtbase
patchfiles-append patch-mkspecs.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global qt_save_cxx_stdlib
</span>
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${qt_save_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS__CXX_STDLIB__|${cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -782,9 +781,6 @@ foreach {module module_info} [array get modules] {
</span> # It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure.cxx_stdlib value is needed later in a post-patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_save_cxx_stdlib ${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cxx_stdlib
configure.sdkroot
configure.cc_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c467232..a221faa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -612,10 +612,9 @@ foreach {module module_info} [array get modules] {
</span> # change default compiler flags for the purpose of building qtbase
patchfiles-append patch-mkspecs.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global qt_save_cxx_stdlib
</span>
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${qt_save_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS__CXX_STDLIB__|${cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -775,9 +774,6 @@ foreach {module module_info} [array get modules] {
</span> # It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure.cxx_stdlib value is needed later in a post-patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_save_cxx_stdlib ${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cxx_stdlib
configure.sdkroot
configure.cc_archflags
</pre><pre style='margin:0'>
</pre>