<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/0b2576a8b3c75271e3388ba11e1025e1ea4f7250">https://github.com/macports/macports-base/commit/0b2576a8b3c75271e3388ba11e1025e1ea4f7250</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 0b2576a consider ports with incorrect cxx_stdlib outdated
</span>0b2576a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0b2576a8b3c75271e3388ba11e1025e1ea4f7250
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Aug 23 18:25:15 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> consider ports with incorrect cxx_stdlib outdated
</span>---
src/macports1.0/macports.tcl | 6 ++++++
src/port/port.tcl | 24 ++++++++++++++++++++++--
2 files changed, 28 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 d9d45ad..ad85350 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;'>@@ -3896,6 +3896,8 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> set requestedflag [registry::property_retrieve $regref requested]
set os_platform_installed [registry::property_retrieve $regref os_platform]
set os_major_installed [registry::property_retrieve $regref os_major]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlib_installed [registry::property_retrieve $regref cxx_stdlib]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlib_overridden [registry::property_retrieve $regref cxx_stdlib_overridden]
</span>
# Before we do
# dependencies, we need to figure out the final variants,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4009,6 +4011,10 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> || [_mportkey $mport os.major] != $os_major_installed)} {
ui_debug "platform mismatch ... upgrading!"
set build_override 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$cxx_stdlib_overridden == 0 && ($cxx_stdlib_installed eq "libstdc++" || $cxx_stdlib_installed eq "libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [_mportkey $mport configure.cxx_stdlib] ne $cxx_stdlib_installed} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "cxx_stdlib mismatch ... upgrading!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_override 1
</span> } elseif {$is_revupgrade_second_run} {
ui_debug "rev-upgrade override ... upgrading (from source)!"
set build_override 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f8aaf40..8cef9e1 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,9 +774,17 @@ proc get_outdated_ports {} {
</span> set regref [registry::open_entry $portname $installed_version $installed_revision $installed_variants $installed_epoch]
set os_platform_installed [registry::property_retrieve $regref os_platform]
set os_major_installed [registry::property_retrieve $regref os_major]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$os_platform_installed ne "" && $os_platform_installed != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlib_installed [registry::property_retrieve $regref cxx_stdlib]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlib_overridden [registry::property_retrieve $regref cxx_stdlib_overridden]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macports::cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wrong_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wrong_stdlib libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {($os_platform_installed ne "" && $os_platform_installed != 0
</span> && $os_major_installed ne "" && $os_major_installed != 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && ($os_platform_installed != ${macports::os_platform} || $os_major_installed != ${macports::os_major})} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ($os_platform_installed != ${macports::os_platform} || $os_major_installed != ${macports::os_major}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || ($cxx_stdlib_overridden == 0 && $cxx_stdlib_installed eq $wrong_stdlib)} {
</span> set comp_result -1
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3413,6 +3421,18 @@ proc action_outdated { action portlist opts } {
</span> && ($os_platform_installed != ${macports::os_platform} || $os_major_installed != ${macports::os_major})} {
set comp_result -1
set reason { (platform $os_platform_installed $os_major_installed != ${macports::os_platform} ${macports::os_major})}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlib_installed [registry::property_retrieve $regref cxx_stdlib]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlib_overridden [registry::property_retrieve $regref cxx_stdlib_overridden]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macports::cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wrong_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wrong_stdlib libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$cxx_stdlib_overridden == 0 && $cxx_stdlib_installed eq $wrong_stdlib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set comp_result -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set reason { (C++ stdlib $cxx_stdlib_installed != ${macports::cxx_stdlib})}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>