<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/08a83769c3a8e99015816661f5a475cbd84a7837">https://github.com/macports/macports-ports/commit/08a83769c3a8e99015816661f5a475cbd84a7837</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 08a83769c3a qt*-qtbase: improve SDK detection
</span>08a83769c3a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 08a83769c3a8e99015816661f5a475cbd84a7837
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Tue Jun 14 01:00:10 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt*-qtbase: improve SDK detection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The qt*-qtbase ports attempted to build a valid SDK name as
</span><span style='display:block; white-space:pre;color:#404040;'> “macosx${configure.sdk_version}”. This candidate SDK was validated by
</span><span style='display:block; white-space:pre;color:#404040;'> checking whether “MacOSX${configure.sdk_version}.sdk” exists in the SDKs
</span><span style='display:block; white-space:pre;color:#404040;'> directory within the developer directory.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In 9887e90d69f4, identical logic in the qmake5 port group was revised to
</span><span style='display:block; white-space:pre;color:#404040;'> instead check for a valid SDK based on ${configure.sdk_version} by
</span><span style='display:block; white-space:pre;color:#404040;'> running “xcrun --sdk macosx${configure.sdk_version} --show-sdk-path”.
</span><span style='display:block; white-space:pre;color:#404040;'> This was later revised by be588d4c1b8b to use “--find ld” instead of
</span><span style='display:block; white-space:pre;color:#404040;'> “--show-sdk-path”, which is a newer option not honored by all versions
</span><span style='display:block; white-space:pre;color:#404040;'> of xcrun.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This change brings the improved logic from the qmake5 port group (and
</span><span style='display:block; white-space:pre;color:#404040;'> later updates) to the various qt*-qtbase subports, which build via the
</span><span style='display:block; white-space:pre;color:#404040;'> Qt configure script and not qmake, and do not otherwise benefit from the
</span><span style='display:block; white-space:pre;color:#404040;'> improvements already made to the qmake5 port group.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is necessary because unlike other recent versions of Xcode, Xcode
</span><span style='display:block; white-space:pre;color:#404040;'> 14.0b1 14A5228q contains a MacOSX13.sdk symbolic link in addition to the
</span><span style='display:block; white-space:pre;color:#404040;'> expected MacOSX13.0.sdk symbolic link. This means that the path
</span><span style='display:block; white-space:pre;color:#404040;'> existence check for MacOSX${configure.sdk_version}.sdk succeeded in this
</span><span style='display:block; white-space:pre;color:#404040;'> configuration when configure.sdk_version was 13, as it will be by
</span><span style='display:block; white-space:pre;color:#404040;'> default on macOS 13. This resulted in Qt being configured with an SDK
</span><span style='display:block; white-space:pre;color:#404040;'> identifier of “macosx13”. Although the MacOSX13.sdk symbolic link was
</span><span style='display:block; white-space:pre;color:#404040;'> present, xcrun and other Xcode tools do not recognize “macosx13” as a
</span><span style='display:block; white-space:pre;color:#404040;'> valid SDK identifier, causing a build configured in this way to fail.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The expectation based on other recent versions of Xcode (since Xcode 12
</span><span style='display:block; white-space:pre;color:#404040;'> and the macOS 11 SDK) is for the existence check to fail, causing the
</span><span style='display:block; white-space:pre;color:#404040;'> build to fall back to the generic “macosx” SDK. By instead using xcrun
</span><span style='display:block; white-space:pre;color:#404040;'> with a candidate SDK name (“xcrun --sdk macosx13”), these ports can now
</span><span style='display:block; white-space:pre;color:#404040;'> check to see whether the SDK identifier to be given to the Qt build is
</span><span style='display:block; white-space:pre;color:#404040;'> considered valid by the Developer Tools installation. This is much more
</span><span style='display:block; white-space:pre;color:#404040;'> accurate than the path existence check.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The qt*-qtbase build winds up encoding the SDK identifier into its
</span><span style='display:block; white-space:pre;color:#404040;'> installed files for its own use during qmake-based builds as
</span><span style='display:block; white-space:pre;color:#404040;'> QMAKE_MAC_SDK, so it’s most desirable for MacPorts’ purposes to track
</span><span style='display:block; white-space:pre;color:#404040;'> the SDK major version when possible, but it’s absolutely undesirable to
</span><span style='display:block; white-space:pre;color:#404040;'> track the SDK minor version, as it will cause qmake to fail if a
</span><span style='display:block; white-space:pre;color:#404040;'> Developer Tools update changes the SDK’s minor version. These minor
</span><span style='display:block; white-space:pre;color:#404040;'> version bumps have occurred in recent Developer Tools updates that
</span><span style='display:block; white-space:pre;color:#404040;'> identify SDKs by both major and minor version numbers. Because
</span><span style='display:block; white-space:pre;color:#404040;'> QMAKE_MAC_SDK may only be set to a short identifier (“macosx10.15” or
</span><span style='display:block; white-space:pre;color:#404040;'> “macosx”) and not a pathname, there is no way to currently identify such
</span><span style='display:block; white-space:pre;color:#404040;'> SDKs to the tools by just a major version number. The only remaining
</span><span style='display:block; white-space:pre;color:#404040;'> option is to specify the SDK as the most generic “macosx”. However, if
</span><span style='display:block; white-space:pre;color:#404040;'> the developer tools do eventually regain the capability to properly
</span><span style='display:block; white-space:pre;color:#404040;'> specify an SDK by just major version (“macosx13”), the strategy
</span><span style='display:block; white-space:pre;color:#404040;'> implemented here will allow these ports to take advantage of it.
</span>---
aqua/phantomjs-qt/Portfile | 20 +++++++++++---------
aqua/qt5/Portfile | 20 +++++++++++---------
aqua/qt511/Portfile | 20 +++++++++++---------
aqua/qt513/Portfile | 20 +++++++++++---------
aqua/qt53/Portfile | 20 +++++++++++---------
aqua/qt55/Portfile | 20 +++++++++++---------
aqua/qt56/Portfile | 20 +++++++++++---------
aqua/qt57/Portfile | 20 +++++++++++---------
aqua/qt58/Portfile | 20 +++++++++++---------
aqua/qt59/Portfile | 20 +++++++++++---------
aqua/qt6/Portfile | 20 +++++++++++++-------
11 files changed, 123 insertions(+), 97 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/Portfile b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c6cf19477c..37940116d8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,17 +366,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<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 a688998106b..ca18aeb92d5 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;'>@@ -1174,17 +1174,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d25d136c31a..f7cbb63b137 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -991,17 +991,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4012b302ebe..45225acb336 100755
</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;'>@@ -998,17 +998,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<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 c9fc9a69b72..88aefa11c36 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;'>@@ -849,17 +849,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a97adaf37a..bb8d2dc4bc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -863,17 +863,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c8b6d25133..31c8ab78b4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -908,17 +908,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf9d5003c48..6a8507ae2e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -978,17 +978,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 463d1a49f3a..ad8a0b38408 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -974,17 +974,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db3c87b338e..2a3c82dc6d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -993,17 +993,19 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> } else {
<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:#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:#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:#ffe0e0;'>- configure.sdk_version
</span> }
# respect configure.sdk_version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58af5cca327..8842f26472d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -658,13 +658,19 @@ foreach {module module_info} [array get modules] {
</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;'>- set sdks_dir ${configure.developer_dir}/Platforms/MacOSX.platform/Developer/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}/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:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid --show-sdk-path since it is not available on all platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/9887e90d69f4265f9056cddc45e41551d7400235#commitcomment-49824261
</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> }
# respect configure.sdk_version
</pre><pre style='margin:0'>
</pre>