<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4523acbc8ee1407c344fac9bc8c371d8cb499b7f">https://github.com/macports/macports-ports/commit/4523acbc8ee1407c344fac9bc8c371d8cb499b7f</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 4523acb qt4 and qmake PG: move check for +debug and debug libraries / frameworks.
</span>4523acb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4523acbc8ee1407c344fac9bc8c371d8cb499b7f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jun 13 08:46:03 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt4 and qmake PG: move check for +debug and debug libraries / frameworks.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> move check for +debug requiring debug libraries / frameworks into qmake PG since this check is valid (only?) when using QMake. This change works with CMake (and the cmake PG); seems to work with other build systems too.
</span>---
_resources/port1.0/group/qmake-1.0.tcl | 16 ++++++++++++++++
_resources/port1.0/group/qt4-1.0.tcl | 16 ----------------
2 files changed, 16 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake-1.0.tcl b/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a3dcd79..077709a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,3 +60,19 @@ pre-configure {
</span> variant debug description "Enable debug binaries" {
configure.pre_args-append "CONFIG+=debug"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# check for +debug variant of this port, and make sure Qt was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# installed with +debug as well; if not, error out.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists debug] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [variant_isset debug] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![info exists building_qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${qt_frameworks_dir}/QtCore.framework/QtCore_debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "\n\nERROR:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In order to install this port as +debug,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Qt4 must also be installed with +debug.\n"
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt4-1.0.tcl b/_resources/port1.0/group/qt4-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a760902..b258023 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt4-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt4-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,22 +34,6 @@
</span> # Usage:
# PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# check for +debug variant of this port, and make sure Qt was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# installed with +debug as well; if not, error out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists debug] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [variant_isset debug] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![info exists building_qt4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${qt_frameworks_dir}/QtCore.framework/QtCore_debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "\n\nERROR:\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-In order to install this port as +debug,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Qt4 must also be installed with +debug.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # standard Qt4 name
global qt_name
set qt_name qt4
</pre><pre style='margin:0'>
</pre>