<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/fa32a8668df03972960638a1ee36b06569ce2656">https://github.com/macports/macports-ports/commit/fa32a8668df03972960638a1ee36b06569ce2656</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fa32a8668df03972960638a1ee36b06569ce2656
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 14:27:46 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qmake5 PG: use options to request debug variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using options allows debug variant to be turned off
</span><span style='display:block; white-space:pre;color:#404040;'> anywhere in the Portfile.
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 16 ++++++++++++----
aqua/qt5/Portfile | 8 ++++----
aqua/qt55/Portfile | 8 ++++----
devel/qscintilla2/Portfile | 3 ++-
devel/qt5-qtcreator/Portfile | 3 +--
5 files changed, 23 insertions(+), 15 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 3c8c3d4..65f629a 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;'>@@ -37,8 +37,9 @@
</span> PortGroup qt5 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options qt5.add_spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt5.add_spec qt5.debug_variant
</span> default qt5.add_spec yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt5.debug_variant yes
</span>
# with the -r option, the examples do not install correctly (no source code)
# the install_sources target is not created in the Makefile(s)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,8 +161,16 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists qt5_qmake_request_no_debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant debug description {Build both release and debug libraries} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add debug variant if one does not exist and one is requested via qt5.debug_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variant is added in eval_variants so that qt5.debug_variant can be set anywhere in the Portfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename ::eval_variants ::real_qmake5_eval_variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc eval_variants {variations} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5.debug_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_exists debug] && [tbool qt5.debug_variant] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant debug description {Build both release and debug libraries} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uplevel ::real_qmake5_eval_variants $variations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# accommodating variant request varies depending on how qtbase was built
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,4 +215,3 @@ if {![info exists qt5_qmake_request_no_debug]} {
</span> configure.args-append "QT_CONFIG-=\"debug_and_release build_all\" CONFIG-=\"debug\""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><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 31d528d..820541e 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;'>@@ -880,6 +880,7 @@ foreach {module module_info} [array get modules] {
</span>
} else {
# these subports use qmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span>
# detremint which variants are to be turned off
set request_examples true
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -896,7 +897,7 @@ foreach {module module_info} [array get modules] {
</span> }
if { [lsearch -exact [lindex ${module_info} 7] "~debug"] != -1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.debug_variant no
</span> }
if { [lsearch -exact [lindex ${module_info} 7] "~examples"] != -1 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -924,8 +925,6 @@ foreach {module module_info} [array get modules] {
</span> default_variants-append ${def_var}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # accommodating variant request varies depending on how qtbase was built
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1165,9 +1164,10 @@ foreach {module module_info} [array get modules] {
</span> port:${name}-qttools \
port:${name}-sqlite-plugin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug true
</span> PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.debug_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # special cases
if { ${module} eq "qtdeclarative" } {
depends_build-append \
<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 e6c2017..49364ed 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;'>@@ -872,6 +872,7 @@ foreach {module module_info} [array get modules] {
</span>
} else {
# these subports use qmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span>
# detremint which variants are to be turned off
set request_examples true
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -888,7 +889,7 @@ foreach {module module_info} [array get modules] {
</span> }
if { [lsearch -exact [lindex ${module_info} 7] "~debug"] != -1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.debug_variant no
</span> }
if { [lsearch -exact [lindex ${module_info} 7] "~examples"] != -1 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -916,8 +917,6 @@ foreach {module module_info} [array get modules] {
</span> default_variants-append ${def_var}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # accommodating variant request varies depending on how qtbase was built
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1169,9 +1168,10 @@ foreach {module module_info} [array get modules] {
</span> port:${name}-qttools \
port:${name}-sqlite-plugin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug true
</span> PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.debug_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # special cases
if { ${module} eq "qtdeclarative" } {
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/Portfile b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2eb1adb..a8a378f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,6 @@ if { ${subport} eq ${name} } {
</span> }
subport ${name}-designer {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug true
</span> PortGroup qmake5 1.0
description Qt Designer plugin for port ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +59,8 @@ subport ${name}-designer {
</span> depends_lib-append \
port:${name} \
port:qt5-qttools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.debug_variant no
</span> }
set python_versions {27 34 35}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/Portfile b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff0db4f..8f6bd9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,6 @@ name qt5-qtcreator
</span>
if { ${subport} eq ${name} } {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug 1
</span> }
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,6 +149,7 @@ subport ${name}-docs {
</span>
universal_variant no
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.debug_variant no
</span>
depends_build-append port:qt5-sqlite-plugin
depends_run-append port:${name}
</pre><pre style='margin:0'>
</pre>