<pre style='margin:0'>
Haren S (harens) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b47cb63967d5f4f864a827e2db9e173399ae5f6a">https://github.com/macports/macports-ports/commit/b47cb63967d5f4f864a827e2db9e173399ae5f6a</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 b47cb63967d qt5*, qt6, phantomjs-qt: correct ui_debug msg
</span>b47cb63967d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b47cb63967d5f4f864a827e2db9e173399ae5f6a
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Mon Nov 14 10:06:27 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> qt5*, qt6, phantomjs-qt: correct ui_debug msg
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-ports/commit/63c5957a4aace1c19fde10907c5207727cc4a8d5
</span>---
aqua/phantomjs-qt/Portfile | 10 +++++-----
aqua/qt511/Portfile | 10 +++++-----
aqua/qt513/Portfile | 10 +++++-----
aqua/qt53/Portfile | 10 +++++-----
aqua/qt55/Portfile | 10 +++++-----
aqua/qt56/Portfile | 10 +++++-----
aqua/qt57/Portfile | 10 +++++-----
aqua/qt58/Portfile | 10 +++++-----
aqua/qt59/Portfile | 10 +++++-----
aqua/qt6/Portfile | 10 +++++-----
10 files changed, 50 insertions(+), 50 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 b8025834d60..c9948ce75b2 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;'>@@ -368,12 +368,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "phantomjs-qt Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "phantomjs-qt Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "phantomjs-qt Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,9 +383,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "phantomjs-qt Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "phantomjs-qt Portfile: the final SDK value is: macosx${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 e1658b3d1cc..98974ccc5fd 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;'>@@ -993,12 +993,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt511 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt511 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt511 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1008,9 +1008,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt511 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt511 Portfile: the final SDK value is: macosx${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 4f404548f44..7dcb96475e3 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;'>@@ -1000,12 +1000,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt513 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt513 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt513 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1015,9 +1015,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt513 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt513 Portfile: the final SDK value is: macosx${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 67b62267cc4..a5307194f02 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;'>@@ -851,12 +851,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt53 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt53 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt53 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -866,9 +866,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt53 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt53 Portfile: the final SDK value is: macosx${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 35d4cc59c9b..c5b93058d74 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;'>@@ -865,12 +865,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt55 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt55 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt55 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -880,9 +880,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt55 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt55 Portfile: the final SDK value is: macosx${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 c3921e7dacc..00947e79907 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;'>@@ -910,12 +910,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt56 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt56 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt56 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -925,9 +925,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt56 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt56 Portfile: the final SDK value is: macosx${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 fe5c244bd17..12b8b8f2cd7 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;'>@@ -980,12 +980,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt57 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt57 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt57 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -995,9 +995,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt57 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt57 Portfile: the final SDK value is: macosx${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 b7c04c09e36..517dc84f002 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;'>@@ -976,12 +976,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt58 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt58 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt58 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -991,9 +991,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt58 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt58 Portfile: the final SDK value is: macosx${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 8653d034659..4c661551470 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;'>@@ -995,12 +995,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt59 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt59 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt59 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1010,9 +1010,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt59 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt59 Portfile: the final SDK value is: macosx${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 a21f21444fa..96135da1ce0 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;'>@@ -660,12 +660,12 @@ foreach {module module_info} [array get modules] {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
# TODO: should we just always use the generic SDK on new systems?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt6 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt6 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt6 Portfile: system-specific SDK was not found, looking for generic SDK."
</span> # if no specific sdk found, check for a generic macosx sdk
if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
ui_error "${subport}: no usable SDK can be found"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -675,9 +675,9 @@ foreach {module module_info} [array get modules] {
</span> configure.sdk_version
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt6 Portfile: system-specific SDK was found."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt6 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span> }
# respect configure.sdk_version
</pre><pre style='margin:0'>
</pre>