<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/45b8918cfcc8c58d5b8c44a03433d3c394d78e76">https://github.com/macports/macports-base/commit/45b8918cfcc8c58d5b8c44a03433d3c394d78e76</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 45b8918cfcc8c58d5b8c44a03433d3c394d78e76
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jul 22 13:31:51 2020 +1000
<span style='display:block; white-space:pre;color:#404040;'> Never raise an error in configure_get_sdkroot
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There may be times when it's appropriate to error out when the
</span><span style='display:block; white-space:pre;color:#404040;'> requested SDK isn't present, but this isn't the right place for it,
</span><span style='display:block; white-space:pre;color:#404040;'> since it can make Portfiles fail to parse entirely.
</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/60465
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 5764fd926501f1cc620c3acf6e88ebda99f58fb9)
</span>---
src/port1.0/portconfigure.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index cd4c966e..ba0c6a47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,8 +597,8 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> return $sdk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Unable to determine location of a macOS SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Unable to determine location of a macOS SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We can get here if $sdk_version != $macosx_version on old OS versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {}
</span> }
# internal function to determine DEVELOPER_DIR according to Xcode dependency
</pre><pre style='margin:0'>
</pre>