<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/47ae208f06787e1bac4fd798a4ea82b84a50b7c0">https://github.com/macports/macports-ports/commit/47ae208f06787e1bac4fd798a4ea82b84a50b7c0</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 47ae208f067 qt513: find correct SDK
</span>47ae208f067 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 47ae208f06787e1bac4fd798a4ea82b84a50b7c0
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat May 13 13:03:21 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt513: find correct SDK
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/67414
</span>---
aqua/qt513/Portfile | 33 +--------------------------------
1 file changed, 1 insertion(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
</span>old mode 100755
new mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b05463358e0..772b9117155
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -991,41 +991,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt513 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt513 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /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;'>- ui_debug "qt513 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</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;'>- }
</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} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</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;'>- ui_debug "qt513 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt513 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|[qt5pg::qmake_mac_sdk]|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
</pre><pre style='margin:0'>
</pre>