<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/0e966b4559c19886a08817bfd836326adf16460c">https://github.com/macports/macports-ports/commit/0e966b4559c19886a08817bfd836326adf16460c</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 0e966b4559c qt5 PG: add option for valid QMAKE_MAC_SDK value
</span>0e966b4559c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0e966b4559c19886a08817bfd836326adf16460c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jun 10 13:30:45 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: add option for valid QMAKE_MAC_SDK value
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 2 +-
_resources/port1.0/group/qt5-1.0.tcl | 6 +++++-
2 files changed, 6 insertions(+), 2 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 791fe2b9c80..dc3eebf4d4c 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;'>@@ -97,7 +97,7 @@ pre-configure {
</span> puts ${cache} "}"
}
puts ${cache} "QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} "QMAKE_MAC_SDK=[qt5pg::qmake_mac_sdk]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "QMAKE_MAC_SDK=${qt5.mac_sdk}"
</span>
# https://github.com/qt/qtbase/commit/d64940891dffcb951f4b76426490cbc94fb4aba7
# Enable ccache support if active and available in given qt5 version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1548955f53b..7b2c0a1cedb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,10 @@ default qt5.kde_variant no
</span> options qt5.min_version
default qt5.min_version 5.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# valid value for Qt variable QMAKE_MAC_SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt5.mac_sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt5.mac_sdk {[qt5pg::qmake_mac_sdk]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # use PKGCONFIG for Qt discovery in configure scripts
depends_build-delete port:pkgconfig
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,7 +308,7 @@ proc qt5pg::check_min_version {} {
</span> }
port::register_callback qt5pg::check_min_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# get a valid vallue for Qt variable QMAKE_MAC_SDK_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# get a valid value for Qt variable QMAKE_MAC_SDK
</span> proc qt5pg::qmake_mac_sdk {} {
global configure.sdkroot \
configure.sdk_version
</pre><pre style='margin:0'>
</pre>