<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/85666b39e27f1c6c9893780f8dbbce3843e2266b">https://github.com/macports/macports-ports/commit/85666b39e27f1c6c9893780f8dbbce3843e2266b</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 85666b39e27 qt5-N: move xcrun test to post-patch block
</span>85666b39e27 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 85666b39e27f1c6c9893780f8dbbce3843e2266b
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Nov 6 17:12:01 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> qt5-N: move xcrun test to post-patch block
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> otherwise it errors out when being parsed by a linux system.
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/66171
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> if this works properly as I think it will, I'll move this
</span><span style='display:block; white-space:pre;color:#404040;'> everywhere else it is needed too.
</span>---
aqua/qt5/Portfile | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 878bd637c06..4333d535ebe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1177,15 +1177,17 @@ foreach {module module_info} [array get modules] {
</span> #
# avoid --show-sdk-path since it is not available on all platforms
# see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk can be found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} does not exist"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if no specific sdk can be found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} does not exist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>