<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/a91a47b24022644e17dadfe7ff43540b7de41de9">https://github.com/macports/macports-base/commit/a91a47b24022644e17dadfe7ff43540b7de41de9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a91a47b24022644e17dadfe7ff43540b7de41de9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 13 23:48:07 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> _check_xcode_version improvements
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Warn about missing system headers with Xcode 10.x on 10.13.
</span><span style='display:block; white-space:pre;color:#404040;'> Warn about missing native SDK on 10.14 and later.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 8a7d6049444225b51d9a90a4cfe94a810f97551b)
</span>---
src/port1.0/portutil.tcl | 15 ++++++++++++---
1 file changed, 12 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 2b6e356..60df904 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;'>@@ -3323,7 +3323,7 @@ proc _check_xcode_version {} {
</span> ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on macOS ${macosx_version}."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 4.3 and above requires the command-line utilities package to be installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 4.3 and above requires the command-line utilities package to be installed.
</span> if {[vercmp $xcodeversion 4.3] >= 0 || ($xcodeversion eq "none" && [file exists "/Applications/Xcode.app"])} {
if {[vercmp $macosx_version 10.9] >= 0} {
# on Mavericks, /usr/bin/make might always installed as a shim into the command line tools installer.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3335,8 +3335,12 @@ proc _check_xcode_version {} {
</span> }
# Check whether /usr/include and /usr/bin/make exist and tell users to install the command line tools, if they don't
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 9.3] < 0 && (![file isdirectory [file join $cltpath usr include]] || ![file executable [file join $cltpath usr bin make]])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "System headers do not appear to be installed. Most ports should build correctly, but if you experience problems due to a port depending on system headers, please file a ticket at https://trac.macports.org."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 17 && (![file isdirectory [file join $cltpath usr include]] || ![file executable [file join $cltpath usr bin make]])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $xcodeversion 10.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "System headers do not appear to be installed. Ports may not build correctly due to Xcode 10 only providing a 10.14 SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "System headers do not appear to be installed. Most ports should build correctly, but if you experience problems due to a port depending on system headers, please file a ticket at https://trac.macports.org."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[vercmp $macosx_version 10.9] >= 0} {
ui_warn "You can install them as part of the Xcode Command Line Tools package by running `xcode-select --install'."
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3345,6 +3349,11 @@ proc _check_xcode_version {} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18 && [file tail [option configure.sdkroot]] ne "MacOSX[option configure.sdk_version].sdk"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Check whether users have agreed to the Xcode license agreement
catch {exec [findBinary xcrun $portutil::autoconf::xcrun_path] clang 2>@1} output
set output [join [lrange [split $output "\n"] 0 end-1] "\n"]
</pre><pre style='margin:0'>
</pre>