<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/24ca991f0b0592130ec5490997a697750a212aee">https://github.com/macports/macports-ports/commit/24ca991f0b0592130ec5490997a697750a212aee</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 24ca991 qt5*: workaround for invalid configure.sdk_version
</span>24ca991 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 24ca991f0b0592130ec5490997a697750a212aee
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Feb 18 20:53:15 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: workaround for invalid configure.sdk_version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53597
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 10 ++++++++++
aqua/qt5/Portfile | 10 ++++++++++
aqua/qt55/Portfile | 10 ++++++++++
3 files changed, 30 insertions(+)
<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 41ccd99..a25313d 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;'>@@ -70,6 +70,16 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # starting with Xcode 7.0, the SDK for build OS version might not be available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/53597
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![file exists ${sdks_dir}/MacOSX${configure.sdk_version}.sdk] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # set QT and QMAKE values in a cache file
# previously, they were set using configure.args
# a cache file is used for two reasons
<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 13b45e0..a97d335 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;'>@@ -729,6 +729,16 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # starting with Xcode 7.0, the SDK for build OS version might not be available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/53597
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![file exists ${sdks_dir}/MacOSX${configure.sdk_version}.sdk] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # respect configure.sdk_version value
patchfiles-append patch-macx.conf.diff
post-patch {
<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 56a2a4b..1e57c04 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;'>@@ -723,6 +723,16 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # starting with Xcode 7.0, the SDK for build OS version might not be available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/53597
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![file exists ${sdks_dir}/MacOSX${configure.sdk_version}.sdk] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # respect configure.sdk_version value
patchfiles-append patch-macx.conf.diff
post-patch {
</pre><pre style='margin:0'>
</pre>