<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8af2dd4b57e4fce0ed4c98cc0a40c35e768b8389">https://github.com/macports/macports-ports/commit/8af2dd4b57e4fce0ed4c98cc0a40c35e768b8389</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 8af2dd4b57e python pg style adjustments
</span>8af2dd4b57e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8af2dd4b57e4fce0ed4c98cc0a40c35e768b8389
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue May 4 05:51:43 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> python pg style adjustments
</span>---
_resources/port1.0/group/python-1.0.tcl | 54 ++++++++++++++-------------------
1 file changed, 22 insertions(+), 32 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 5d42be494c2..c2702b52fcf 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;'>@@ -40,7 +40,7 @@ post-extract {
</span> close $fs
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-destroot {
</span> xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}/examples
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,25 +86,19 @@ proc python_get_default_version {} {
</span> }
proc python_get_compiler_tags {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return {cc objc cxx objcxx fc f77 f90}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [list cc objc cxx objcxx fc f77 f90]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc python_set_env_compilers { phase } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc python_set_env_compilers {phase} {
</span> foreach tag [python_get_compiler_tags] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.${tag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[set configure.${tag}] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.${tag}] ne ""} {
</span> ${phase}.env-append [string toupper $tag]=[python_get_compiler_command ${tag}]
}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc python_compilerwrap_dir { } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global workpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${workpath}/compilerwrap/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Configure support for ccache
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc python_configure_ccache { } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc python_configure_ccache {} {
</span> global prefix
if {[option configure.ccache] && [file exists ${prefix}/bin/ccache]} {
# Set some cmake env vars incase build uses cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +117,7 @@ proc python_configure_ccache { } {
</span> set ctag [string toupper $tag]
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach phase {configure build destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach phase [list configure build destroot] {
</span> ${phase}.env-append CMAKE_${ctag}_COMPILER_LAUNCHER=${prefix}/bin/ccache
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,21 +125,19 @@ proc python_configure_ccache { } {
</span> }
port::register_callback python_configure_ccache
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc python_create_compiler_wrap { tag } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix configure.${tag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp [set configure.${tag}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${comp} ne "" && [file exists ${prefix}/bin/ccache] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wrapdir [python_compilerwrap_dir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file exists ${wrapdir}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${wrapdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc python_create_compiler_wrap {tag} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set comp [option configure.${tag}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${comp} ne "" && [file exists ${prefix}/bin/ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wrapdir [option workpath]/compilerwrap/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${wrapdir}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${wrapdir}
</span> }
set fname ${wrapdir}/[file tail ${comp}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${fname}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Recreate in case underlying compiler has changed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${fname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Recreate in case underlying compiler has changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${fname}
</span> ui_debug "Creating compiler wrapper ${fname}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set f [ open ${fname} w 0755 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f [open ${fname} w 0755]
</span> puts ${f} "#!/bin/bash"
puts ${f} "exec ${prefix}/bin/ccache ${comp} \"\$\{\@\}\""
close ${f}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,13 +146,11 @@ proc python_create_compiler_wrap { tag } {
</span> return ${comp}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc python_get_compiler_command { tag } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.${tag} configure.ccache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp [set configure.${tag}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option configure.ccache] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp [ python_create_compiler_wrap ${tag} ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc python_get_compiler_command {tag} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set comp [option configure.${tag}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set comp [python_create_compiler_wrap ${tag}]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "For compiler tag=${tag} using ${comp}"
</span> return ${comp}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -368,7 +358,7 @@ proc python_set_pep517 {option action args} {
</span> } else {
depends_build-delete port:py${python.version}-pep517 \
port:py${python.version}-python-install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,7 +416,7 @@ proc python_get_defaults {var} {
</span> } else {
# look for "${inc_dir}*" and pick the first one found;
# make assumptions if none are found
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set inc_dirs [glob ${inc_dir}*]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {glob ${inc_dir}*} inc_dirs]} {
</span> # append 'm' suffix if 30 <= PyVer <= 37
# Py27- and Py38+ do not use this suffix
if {${python.version} < 30 || ${python.version} > 37} {
</pre><pre style='margin:0'>
</pre>