<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6f285079a1f08fe275d2b66dee8d7352826184e1">https://github.com/macports/macports-ports/commit/6f285079a1f08fe275d2b66dee8d7352826184e1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6f285079a1f08fe275d2b66dee8d7352826184e1
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 1 20:04:25 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> python PG: Support using ccache when enabled
</span>---
_resources/port1.0/group/python-1.0.tcl | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/python-1.0.tcl b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index bea46573b59..240b720ff7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,6 +84,15 @@ proc python_get_default_version {} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc python_get_compiler_command { var } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.${var} configure.ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.ccache] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "ccache [set configure.${var}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [set configure.${var}]
</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> proc python_set_versions {option action args} {
if {$action ne "set"} {
return
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +100,6 @@ proc python_set_versions {option action args} {
</span> global name subport python._addedcode
if {[string match py-* $name]} {
foreach v [option $option] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport py${v}[string trimleft $name py] { depends_lib-append port:python${v} }
}
if {$subport eq $name || $subport eq ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +183,7 @@ proc python_set_versions {option action args} {
</span> if {${python.set_compiler}} {
foreach var {cc objc cxx fc f77 f90} {
if {[set configure.${var}] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append [string toupper $var]=[set configure.${var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append [string toupper $var]=[python_get_compiler_command ${var}]
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,7 +234,7 @@ proc python_set_versions {option action args} {
</span> if {${python.set_compiler} && ${python.consistent_destroot}} {
foreach var {cc objc cxx fc f77 f90} {
if {[set configure.${var}] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append [string toupper $var]=[set configure.${var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append [string toupper $var]=[python_get_compiler_command ${var}]
</span> }
}
}
</pre><pre style='margin:0'>
</pre>