<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/f5017c50fe994434689d26d932cddb2eb7caccee">https://github.com/macports/macports-ports/commit/f5017c50fe994434689d26d932cddb2eb7caccee</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 f5017c5 qt5 PG: do no run certain code if building base
</span>f5017c5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f5017c50fe994434689d26d932cddb2eb7caccee
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Jan 6 19:26:15 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: do no run certain code if building base
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Do not check for installed qtbase if qtbase is being installed.
</span><span style='display:block; white-space:pre;color:#404040;'> Do not add qtbase as as dependency if qtbase is being installed.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53240
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 4 ++++
1 file changed, 4 insertions(+)
<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 0f6caa2..c139dac 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;'>@@ -325,6 +325,7 @@ pre-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists building_qt5]} {
</span> pre-configure {
set qt_installed_name ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,6 +368,7 @@ pre-configure {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# add qt5kde variant if one does not exist and one is requested via qt5.using_kde
# variant is added in eval_variants so that qt5.using_kde can be set anywhere in the Portfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -712,4 +714,6 @@ namespace eval qt5pg {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists building_qt5]} {
</span> port::register_callback qt5pg::register_dependents
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>