<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235">https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235</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 9887e90d69f qmake5 pg: use xcrun to test for SDK availability
</span>9887e90d69f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9887e90d69f4265f9056cddc45e41551d7400235
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Wed Apr 21 14:39:37 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> qmake5 pg: use xcrun to test for SDK availability
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead of testing for the path, just use `xcrun` to verify the
</span><span style='display:block; white-space:pre;color:#404040;'> availability of the desired SDK version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The existence of an appropriately named SDK directory (e.g.
</span><span style='display:block; white-space:pre;color:#404040;'> `MacOSX${configure.sdk_version}.sdk`) is not sufficient to determine
</span><span style='display:block; white-space:pre;color:#404040;'> whether the desired SDK actually exists; e.g., a compatibility symlink
</span><span style='display:block; white-space:pre;color:#404040;'> might exist, but actually point to a later SDK version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Without this change, qmake builds will fail when the toolchain actually
</span><span style='display:block; white-space:pre;color:#404040;'> attempts to resolve such an SDK version.
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index cdecc790a9b..b939e470cd3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,16 +54,7 @@ pre-configure {
</span>
# starting with Xcode 7.0, the SDK for build OS version might not be available
# see https://trac.macports.org/ticket/53597
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${use_xcode} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 4.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks_dir ${configure.developer_dir}/SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks_dir ${configure.developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks_dir ${configure.developer_dir}/SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file exists ${sdks_dir}/MacOSX${configure.sdk_version}.sdk] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {exec /usr/bin/xcrun --sdk macosx${configure.sdk_version} --show-sdk-path} result]} {
</span> configure.sdk_version
}
</pre><pre style='margin:0'>
</pre>