<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d3fb067bd6c3908e8ad43c0f820da8777e35e2b5">https://github.com/macports/macports-base/commit/d3fb067bd6c3908e8ad43c0f820da8777e35e2b5</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 d3fb067b portutil: Provide more useful warning when SDK mis-match detected
</span>d3fb067b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d3fb067bd6c3908e8ad43c0f820da8777e35e2b5
</span>Author: Chris Jones <cjones051073@icloud.com>
AuthorDate: Wed Nov 3 09:58:32 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> portutil: Provide more useful warning when SDK mis-match detected
</span>---
src/port1.0/portutil.tcl | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ed25d4f9..31c06be6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3404,9 +3404,16 @@ proc _check_xcode_version {} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 18 && [option configure.sdk_version] ne "" && ![string match MacOSX[option configure.sdk_version]*.sdk [file tail [option configure.sdkroot]]]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "The macOS [option configure.sdk_version] SDK does not appear to be installed. Ports may not build correctly."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "You can install it as part of the Xcode Command Line Tools package by running `xcode-select --install'."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18 && [option configure.sdk_version] ne "" &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![string match MacOSX[option configure.sdk_version]*.sdk [file tail [option configure.sdkroot]]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.sdkroot] eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "The macOS [option configure.sdk_version] SDK is requested but configure.sdkroot is set to"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "a NULL string. Ports may not build correctly with this configuration."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "The macOS [option configure.sdk_version] SDK does not appear to be match the configured"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "SDKROOT '[option configure.sdkroot]'. Ports may not build correctly."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "You can install it as part of the Xcode Command Line Tools package by running `xcode-select --install'."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Check whether users have agreed to the Xcode license agreement
</pre><pre style='margin:0'>
</pre>