<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/c6d6c353200d8acd2c8e6596ed308cdde9efcc4c">https://github.com/macports/macports-ports/commit/c6d6c353200d8acd2c8e6596ed308cdde9efcc4c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c6d6c353200d8acd2c8e6596ed308cdde9efcc4c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 15:52:34 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: add procedure to handle build dependencies
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 37 ++++++++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e028089..22b0bcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,6 +250,12 @@ proc qt5.depends_component {args} {
</span> lappend qt5_private_components ${comp}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc qt5.depends_build_component {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_build_components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach comp ${args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend qt5_private_build_components ${comp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# no universal binary support in Qt 5
# see http://lists.qt-project.org/pipermail/interest/2012-December/005038.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -633,13 +639,17 @@ namespace eval qt5pg {
</span> # as of 5.7, still maintained by community
proc register_dependents {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global qt5_private_components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_components qt5_private_build_components
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![exists qt5_private_components] || ${qt5_private_components} eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![exists qt5_private_components] } {
</span> # no Qt components have been requested
# qt5.depends_component has never been called
set qt5_private_components ""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![exists qt5_private_build_components] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt5.depends_build_component has never been called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt5_private_build_components ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if { [variant_exists qt5kde] && [variant_isset qt5kde] } {
set qt_kde_name qt5-kde
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -660,6 +670,20 @@ namespace eval qt5pg {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach component ${qt5_private_build_components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch -exact ${component} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebkit -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebengine -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebview -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtenginio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these components are subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:${qt_kde_name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt5-kde provides all components except those above
</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> } else {
# ![variant_isset qt5kde]
set qt_default_name [qt5.get_default_name]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -674,6 +698,15 @@ namespace eval qt5pg {
</span> return -code error "unknown component ${comp}"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach component ${qt5_private_build_components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [info exists qt5pg::qt5_component_lib(${component})] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set component_info $qt5pg::qt5_component_lib(${component})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set path [lindex ${component_info} 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:${path}:${qt_default_name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "unknown component ${comp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>