<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/03b11f7d2aa9a953e7f7abb4b0b8c76a2f143083">https://github.com/macports/macports-ports/commit/03b11f7d2aa9a953e7f7abb4b0b8c76a2f143083</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 03b11f7d2aa qt5*: use qt5 PG to set QMAKE_MAC_SDK
</span>03b11f7d2aa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 03b11f7d2aa9a953e7f7abb4b0b8c76a2f143083
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jun 10 13:37:28 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: use qt5 PG to set QMAKE_MAC_SDK
</span>---
aqua/phantomjs-qt/Portfile | 33 +--------------------------------
aqua/qt5/Portfile | 33 +--------------------------------
aqua/qt511/Portfile | 2 +-
aqua/qt513/Portfile | 2 +-
aqua/qt53/Portfile | 33 +--------------------------------
aqua/qt55/Portfile | 33 +--------------------------------
aqua/qt56/Portfile | 33 +--------------------------------
aqua/qt57/Portfile | 33 +--------------------------------
aqua/qt58/Portfile | 33 +--------------------------------
aqua/qt59/Portfile | 33 +--------------------------------
10 files changed, 10 insertions(+), 258 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 22565006b6e..a539ed19f9b 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;'>@@ -361,41 +361,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "phantomjs-qt Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "phantomjs-qt Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "phantomjs-qt Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "phantomjs-qt Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "phantomjs-qt Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 131a9739619..495a417255a 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;'>@@ -1199,41 +1199,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 020bd8d0e15..6f6397e2653 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;'>@@ -987,7 +987,7 @@ foreach {module module_info} [array get modules] {
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|[qt5pg::qmake_mac_sdk]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 4c29ac3b696..7f90608cceb 100644
</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;'>@@ -994,7 +994,7 @@ foreach {module module_info} [array get modules] {
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|[qt5pg::qmake_mac_sdk]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 4eb8dc36827..32f1eead00c 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,41 +849,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt53 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt53 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt53 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt53 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt53 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 23d5d1f9cc1..820dabca7b4 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;'>@@ -856,41 +856,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt55 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt55 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt55 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt55 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt55 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 c473e757758..47ce7f84239 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;'>@@ -901,41 +901,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt56 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt56 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt56 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt56 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt56 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 6f3577ff208..dc1de5e20e3 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;'>@@ -971,41 +971,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt57 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt57 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt57 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt57 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt57 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 642ccfb0a14..a8b04fbaf7b 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;'>@@ -972,41 +972,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt58 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt58 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt58 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt58 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt58 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<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 7dcf03639df..e2abd714687 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;'>@@ -986,41 +986,10 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/gcc-base.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qt calls xcrun to find the SDK to use, so make sure this call will succeed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt59 Portfile: the initial SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first try for a system-specific SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first . ${configure.sdk_version}] == -1 && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcrun doesn't like major version only (e.g. macosx11), try to find a full version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks [lsort -command vercmp -decreasing [glob -nocomplain [file rootname ${configure.sdkroot}]*.sdk]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version [string map {MacOSX ""} [file rootname [file tail [lindex $sdks 0]]]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using possibly more specific SDK version: ${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt59 Portfile: testing for system-specific SDK:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx${configure.sdk_version} --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt59 Portfile: system-specific SDK was not found, looking for generic SDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if no specific sdk found, check for a generic macosx sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec -ignorestderr env DEVELOPER_DIR=${configure.developer_dir} /usr/bin/xcrun --sdk macosx --find ld > /dev/null 2>@1}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport}: no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "no usable SDK can be found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: using generic macosx SDK as macosx${configure.sdk_version} was not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt59 Portfile: system-specific SDK was found."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt59 Portfile: the final SDK value is: macosx${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # respect configure.sdk_version
post-patch {
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_MAC_SDK__|macosx${configure.sdk_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_MAC_SDK__|${qt5.mac_sdk}|g" \
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
</pre><pre style='margin:0'>
</pre>