<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/19c16e2e467bf3805c1b66f0e9df23c1b41900fc">https://github.com/macports/macports-ports/commit/19c16e2e467bf3805c1b66f0e9df23c1b41900fc</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 19c16e2  qmake5 PG: prevent -stdlib= to an empty value
</span>19c16e2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 19c16e2e467bf3805c1b66f0e9df23c1b41900fc
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Oct 8 10:30:31 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qmake5 PG: prevent -stdlib= to an empty value
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes https://trac.macports.org/ticket/59128
</span>---
 _resources/port1.0/group/qmake5-1.0.tcl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 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 8fb8e51..bf49721 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;'>@@ -132,7 +132,8 @@ pre-configure {
</span>     set qmake5_l_flags     [join ${qmake5_l_flags}     " "]
 
     if { [vercmp ${qt5.version} 5.6] >= 0 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # see https://trac.macports.org/ticket/59128 for `${configure.cxx_stdlib} ne ""` test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { ${configure.cxx_stdlib} ne "libc++" && ${configure.cxx_stdlib} ne "" } {
</span>             # override C++ flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
             #    so value of ${configure.cxx_stdlib} can always be used
             puts ${cache} QMAKE_CXXFLAGS-=-stdlib=libc++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,7 +152,7 @@ pre-configure {
</span> 
         # override C++ flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
         #    so value of ${configure.cxx_stdlib} can always be used
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { ${configure.cxx_stdlib} ne "libc++" && ${configure.cxx_stdlib} ne "" } {
</span>             puts ${cache} QMAKE_CXXFLAGS_CXX11-=-stdlib=libc++
             puts ${cache} QMAKE_LFLAGS_CXX11-=-stdlib=libc++
             puts ${cache} QMAKE_CXXFLAGS_CXX11+=-stdlib=${configure.cxx_stdlib}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,8 +163,10 @@ pre-configure {
</span>         }
     } else {
         # always use the same standard library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        puts ${cache} QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        puts ${cache} QMAKE_LFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { ${configure.cxx_stdlib} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${cache} QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            puts ${cache} QMAKE_LFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>         if {${qmake5_cxx11_flags} ne ""} {
             puts ${cache} QMAKE_CXXFLAGS+="${qmake5_cxx11_flags}"
         }
</pre><pre style='margin:0'>

</pre>