<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/d239680ce7b24fe3539844a607bf31e5d082bec9">https://github.com/macports/macports-ports/commit/d239680ce7b24fe3539844a607bf31e5d082bec9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d239680ce7b24fe3539844a607bf31e5d082bec9
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Sat Nov 12 16:33:43 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> qt53: fix parse error on non-Darwin
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66239 [skip ci]
</span>---
aqua/qt53/Portfile | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b8b8f58571d..67b62267cc4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -847,21 +847,28 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # starting with Xcode 7.0, the SDK for build OS version might not be available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/53597
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</span><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:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: should we just always use the generic SDK on new systems?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # first try for a system-specific SDK
</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;'>+ ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if no specific sdk 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} was not found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
<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;'>+ ui_debug "qt5 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span> }
# respect configure.sdk_version
</pre><pre style='margin:0'>
</pre>