<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch release-2.4
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/217e1441e601573eb3e25656cdaf3c1ea2daa30f">https://github.com/macports/macports-base/commit/217e1441e601573eb3e25656cdaf3c1ea2daa30f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 217e1441e601573eb3e25656cdaf3c1ea2daa30f
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Fri Jan 12 13:05:08 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> Find port providing ccache binary for trace mode
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead of assuming the ccache binary is provided by the ccache port,
</span><span style='display:block; white-space:pre;color:#404040;'> query the registry which port provides ${prefix}/bin/ccache if it exists
</span><span style='display:block; white-space:pre;color:#404040;'> and also include all dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55680
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 64c60f29d85d6290913efb6dd1c718e9f5da811e)
</span>---
src/port1.0/portutil.tcl | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b3cebb..a0f2ef1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1308,7 +1308,7 @@ set ports_dry_last_skipped ""
</span> proc target_run {ditem} {
global target_state_fd workpath portpath ports_trace PortInfo ports_dryrun \
ports_dry_last_skipped worksrcpath subport env portdbpath \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_version prefix
</span> set portname $subport
set result 0
set skipped 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1451,9 +1451,11 @@ proc target_run {ditem} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add ccache port for access to ${prefix}/bin/ccache binary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend deplist ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add ccache port for access to ${prefix}/bin/ccache binary if it exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.ccache] && [file exists ${prefix}/bin/ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set name [_get_dep_port path:bin/ccache:ccache]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend deplist $name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set deplist [recursive_collect_deps $name $deplist]
</span> }
ui_debug "Tracemode will respect recursively collected port dependencies: [lsort $deplist]"
</pre><pre style='margin:0'>
</pre>