<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/f7b6cd21ca392b4aae2407c289639510020f9c77">https://github.com/macports/macports-base/commit/f7b6cd21ca392b4aae2407c289639510020f9c77</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 f7b6cd2 Don't accidentally use the DevSDK if there is a /usr/include turd present on macOS 10.15+
</span>f7b6cd2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f7b6cd21ca392b4aae2407c289639510020f9c77
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Tue Jun 9 11:25:57 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> Don't accidentally use the DevSDK if there is a /usr/include turd present on macOS 10.15+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> macOS 10.15+ does not support DevSDK, so omit it completely.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Check for /usr/include/sys/cdefs.h rather than just /usr/include just incase
</span><span style='display:block; white-space:pre;color:#404040;'> someone accidentally installed some content in /usr/include.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</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 17a7cf6..0b1aca6 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;'>@@ -469,7 +469,7 @@ proc portconfigure::configure_get_ld_archflags {} {
</span> }
proc portconfigure::configure_get_sdkroot {sdk_version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global developer_dir macosx_version xcodeversion os.arch os.platform use_xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global developer_dir macosx_version xcodeversion os.arch os.major os.platform use_xcode
</span>
# This is only relevant for macOS
if {${os.platform} ne "darwin"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -482,7 +482,7 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> }
# Use the DevSDK (eg: /usr/include) if present and the requested SDK version matches the host version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$sdk_version eq $macosx_version && [file exists /usr/include]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 19 && $sdk_version eq $macosx_version && [file exists /usr/include/sys/cdefs.h]} {
</span> return {}
}
</pre><pre style='margin:0'>
</pre>