<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/a514690f36cae58817d6841f10c69c7c351e313e">https://github.com/macports/macports-base/commit/a514690f36cae58817d6841f10c69c7c351e313e</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 a514690  Always set cxx_stdlib_overridden when installing
</span>a514690 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a514690f36cae58817d6841f10c69c7c351e313e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jun 2 07:42:27 2018 +1000

<span style='display:block; white-space:pre;color:#404040;'>    Always set cxx_stdlib_overridden when installing
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Use information from the Portfile if it's not in the archive.
</span>---
 src/macports1.0/macports.tcl | 6 ++++--
 src/port1.0/portinstall.tcl  | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index eaac98d..19481eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4697,8 +4697,10 @@ proc macports::revupgrade_update_cxx_stdlib {fancy_output {revupgrade_progress "
</span>                     lappend binary_files [$filehandle actual_path]
                 }
                 $maybe_port cxx_stdlib [get_actual_cxx_stdlib $binary_files]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                # can't tell after the fact, assume not overridden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                $maybe_port cxx_stdlib_overridden 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[catch {$maybe_port cxx_stdlib_overridden}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    # can't tell after the fact, assume not overridden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    $maybe_port cxx_stdlib_overridden 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span>             }
         }
         if {$fancy_output} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portinstall.tcl b/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f1c8f7..83ca0b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,6 +391,10 @@ proc portinstall::install_main {args} {
</span>         if {${portinstall::actual_cxx_stdlib} ne ""} {
             $regref cxx_stdlib ${portinstall::actual_cxx_stdlib}
             $regref cxx_stdlib_overridden ${portinstall::cxx_stdlib_overridden}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # no info in the archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            global configure.cxx_stdlib cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            $regref cxx_stdlib_overridden [expr {${configure.cxx_stdlib} ne $cxx_stdlib}]
</span>         }
         # Trick to have a portable GMT-POSIX epoch-based time.
         $regref date [expr {[clock scan now -gmt true] - [clock scan "1970-1-1 00:00:00" -gmt true]}]
</pre><pre style='margin:0'>

</pre>