<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/77ec1368e330ec3d24f85c5543cd0c5304137fdf">https://github.com/macports/macports-ports/commit/77ec1368e330ec3d24f85c5543cd0c5304137fdf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 77ec1368e330ec3d24f85c5543cd0c5304137fdf
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 27 10:00:06 2016 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qmake5-1.0.tcl: avoid mixing libc++ and libstdc++
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    see https://trac.macports.org/ticket/52922
</span>---
 _resources/port1.0/group/qmake5-1.0.tcl | 39 +++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 12 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 5e86df4..c6d9fcf 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;'>@@ -92,18 +92,33 @@ if { ${configure.compiler} ne "clang" } {
</span>         QMAKE_CXX=${configure.cxx}
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# override C++11 flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#    so value of ${configure.cxx_stdlib} can always be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    QMAKE_CXXFLAGS_CXX11-=-stdlib=libc++ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    QMAKE_LFLAGS_CXX11-=-stdlib=libc++   \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    QMAKE_CXXFLAGS_CXX11+=-stdlib=${configure.cxx_stdlib} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    QMAKE_LFLAGS_CXX11+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ensure ${configure.cxx_stdlib} is used for C++ stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    QMAKE_LFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${qt_name} eq "qt55" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # always use the same standard library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append                                \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib}  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        QMAKE_LFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # override C++ flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #    so value of ${configure.cxx_stdlib} can always be used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append                                      \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_CXXFLAGS_CXX11-=-stdlib=libc++                   \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_LFLAGS_CXX11-=-stdlib=libc++                     \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_CXXFLAGS_CXX11+=-stdlib=${configure.cxx_stdlib}  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_LFLAGS_CXX11+=-stdlib=${configure.cxx_stdlib}
</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;'>+    if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # override C++ flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #    so value of ${configure.cxx_stdlib} can always be used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append                                \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_CXXFLAGS-=-stdlib=libc++                   \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_LFLAGS-=-stdlib=libc++                     \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib}  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            QMAKE_LFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 if {![info exists qt5_qmake_request_no_debug]} {
     variant debug description {Build both release and debug libraries} {}
</pre><pre style='margin:0'>

</pre>