<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/40cb688f2a657429f2c8bcade266bc4edea10928">https://github.com/macports/macports-ports/commit/40cb688f2a657429f2c8bcade266bc4edea10928</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 40cb688f2a6 qt{5,6}*: find full SDK version on macOS 11+
</span>40cb688f2a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40cb688f2a657429f2c8bcade266bc4edea10928
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Nov 17 02:55:11 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> qt{5,6}*: find full SDK version on macOS 11+
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 11 ++++++++---
aqua/phantomjs-qt/Portfile | 12 +++++++-----
aqua/qt5/Portfile | 14 +++++++-------
aqua/qt511/Portfile | 14 +++++++-------
aqua/qt513/Portfile | 14 +++++++-------
aqua/qt53/Portfile | 13 ++++++++++---
aqua/qt55/Portfile | 14 +++++++-------
aqua/qt56/Portfile | 14 +++++++-------
aqua/qt57/Portfile | 14 +++++++-------
aqua/qt58/Portfile | 14 +++++++-------
aqua/qt59/Portfile | 14 +++++++-------
aqua/qt6/Portfile | 9 +++++++--
12 files changed, 88 insertions(+), 69 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 9171f87a0bd..9cdb30be033 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;'>@@ -52,13 +52,18 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform macosx {
</span> # qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 c9948ce75b2..b2d3a0cd71d 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;'>@@ -272,9 +272,6 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/59434
patchfiles-append patch-qtbase-icu_test.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/59312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,11 +363,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "phantomjs-qt Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "phantomjs-qt Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "phantomjs-qt Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "phantomjs-qt Portfile: system-specific SDK was not found, looking for generic SDK."
<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 ac20dc89602..930ded20e1d 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;'>@@ -29,11 +29,6 @@ if { ${subport} eq "${name}-qtwebkit-examples" } {
</span> set middle_name opensource
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1178,11 +1173,16 @@ foreach {module module_info} [array get modules] {
</span>
if { ${os.platform} eq "darwin" } {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 98974ccc5fd..6174d73720a 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;'>@@ -22,11 +22,6 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> set middle_name opensource
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" || ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -991,11 +986,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt511 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt511 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt511 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt511 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 7dcb96475e3..c0801b50061 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;'>@@ -22,11 +22,6 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> set middle_name opensource
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" || ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -998,11 +993,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt513 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt513 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt513 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt513 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 a5307194f02..18e429e1b00 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;'>@@ -747,7 +747,9 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-qtbase-icu_test.diff
# see https://trac.macports.org/ticket/59312
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
#-----------------------------------------------------------------------------
# qtbase is used for:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -849,11 +851,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt53 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt53 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt53 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt53 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 c5b93058d74..741ca751372 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;'>@@ -15,11 +15,6 @@ homepage https://www.qt.io
</span>
version 5.5.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Requires xcodebuild
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -863,11 +858,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt55 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt55 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt55 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt55 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 00947e79907..72f9f61e568 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;'>@@ -15,11 +15,6 @@ homepage https://www.qt.io
</span>
version 5.6.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Requires xcodebuild
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -908,11 +903,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt56 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt56 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt56 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt56 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 12b8b8f2cd7..6087166be80 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;'>@@ -15,11 +15,6 @@ homepage https://www.qt.io
</span>
version 5.7.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Requires xcodebuild
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -978,11 +973,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt57 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt57 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt57 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt57 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 517dc84f002..feeffb54905 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;'>@@ -15,11 +15,6 @@ homepage https://www.qt.io
</span>
version 5.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Requires xcodebuild
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -974,11 +969,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt58 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt58 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt58 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt58 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 4c661551470..6b366335fd0 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;'>@@ -20,11 +20,6 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> version 5.9.1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/63154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" || ${os.platform} eq "darwin" && ${os.major} >= 21 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortGroup qt5_variables 1.0
# get Qt's version numbers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -993,11 +988,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt59 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt59 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt59 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt59 Portfile: system-specific SDK was not found, looking for generic SDK."
<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 96135da1ce0..e25ff5d7df0 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,11 +658,16 @@ foreach {module module_info} [array get modules] {
</span>
platform darwin {
# qt calls xcrun to find the SDK to use, so make sure this call will succeed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: should we just always use the generic SDK on new systems?
</span>
ui_debug "qt6 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt6 Portfile: testing for system-specific SDK:"
</span> # first try for a system-specific SDK
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt6 Portfile: testing for system-specific SDK:"
</span> if {[catch {exec -ignorestderr /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
ui_debug "qt6 Portfile: system-specific SDK was not found, looking for generic SDK."
</pre><pre style='margin:0'>
</pre>