<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/c23db77930bbad41c9a9863e8bd95482474f16d4">https://github.com/macports/macports-base/commit/c23db77930bbad41c9a9863e8bd95482474f16d4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c23db77930bbad41c9a9863e8bd95482474f16d4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 13 22:16:09 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> look for commands in ${prefix_frozen}/bin
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> A port can change prefix for itself, but commands provided by other
</span><span style='display:block; white-space:pre;color:#404040;'> ports will still be in the globally configured location.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 9adc85b19da638b68983c02e01dfc18865062ef5)
</span>---
src/port1.0/portconfigure.tcl | 56 +++++++++++++++++++++----------------------
src/port1.0/portfetch.tcl | 10 ++++----
src/port1.0/portutil.tcl | 4 ++--
3 files changed, 35 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3602357..833b19f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1164,7 +1164,7 @@ proc portconfigure::find_developer_tool {name} {
</span>
# internal function to find correct compilers
proc portconfigure::configure_get_compiler {type {compiler {}}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.compiler prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.compiler prefix_frozen
</span> if {$compiler eq ""} {
if {[option compiler.require_fortran]} {
switch $type {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1185,14 +1185,14 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> if {[regexp {^apple-gcc(-4\.[02])$} $compiler -> suffix]} {
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/gcc-apple${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/gcc-apple${suffix} }
</span> cxx -
objcxx {
if {$suffix eq "-4.2"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${prefix}/bin/g++-apple${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${prefix_frozen}/bin/g++-apple${suffix}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp { return ${prefix}/bin/cpp-apple${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp { return ${prefix_frozen}/bin/cpp-apple${suffix} }
</span> }
} elseif {$compiler eq "clang"} {
switch $type {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1229,18 +1229,18 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> }
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/clang${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/clang${suffix} }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/clang++${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/clang++${suffix} }
</span> }
} elseif {[regexp {^macports-clang(-\d+\.\d+)$} $compiler -> suffix]} {
set suffix "-mp${suffix}"
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/clang${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/clang${suffix} }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/clang++${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp { return ${prefix}/bin/clang-cpp${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/clang++${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp { return ${prefix_frozen}/bin/clang-cpp${suffix} }
</span> }
} elseif {[regexp {^macports-gcc(-\d+(?:\.\d+)?)?$} $compiler -> suffix]} {
if {$suffix ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1248,62 +1248,62 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> }
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/gcc${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/gcc${suffix} }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/g++${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp { return ${prefix}/bin/cpp${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/g++${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp { return ${prefix_frozen}/bin/cpp${suffix} }
</span> fc -
f77 -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f90 { return ${prefix}/bin/gfortran${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f90 { return ${prefix_frozen}/bin/gfortran${suffix} }
</span> }
} elseif {$compiler eq "macports-llvm-gcc-4.2"} {
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/llvm-gcc-4.2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/llvm-gcc-4.2 }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/llvm-g++-4.2 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp { return ${prefix}/bin/llvm-cpp-4.2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/llvm-g++-4.2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp { return ${prefix_frozen}/bin/llvm-cpp-4.2 }
</span> }
} elseif {$compiler eq "macports-g95"} {
switch $type {
fc -
f77 -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f90 { return ${prefix}/bin/g95 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f90 { return ${prefix_frozen}/bin/g95 }
</span> }
} elseif {[regexp {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang$} $compiler -> mpi]} {
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/mpicc-${mpi}-clang }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/mpicc-${mpi}-clang }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/mpicxx-${mpi}-clang }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/mpicxx-${mpi}-clang }
</span> }
} elseif {[regexp {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang-(\d+\.\d+)$} $compiler -> mpi version]} {
set suffix [join [split ${version} .] ""]
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/mpicc-${mpi}-clang${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/mpicc-${mpi}-clang${suffix} }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/mpicxx-${mpi}-clang${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp { return ${prefix}/bin/clang-cpp-mp-${version} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/mpicxx-${mpi}-clang${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp { return ${prefix_frozen}/bin/clang-cpp-mp-${version} }
</span> }
} elseif {[regexp {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-gcc-(\d+(?:\.\d+)?)$} $compiler -> mpi version]} {
set suffix [join [split ${version} .] ""]
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/mpicc-${mpi}-gcc${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/mpicc-${mpi}-gcc${suffix} }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/mpicxx-${mpi}-gcc${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp { return ${prefix}/bin/cpp-mp-${version} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/mpicxx-${mpi}-gcc${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp { return ${prefix_frozen}/bin/cpp-mp-${version} }
</span> fc -
f77 -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f90 { return ${prefix}/bin/mpifort-${mpi}-gcc${suffix} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f90 { return ${prefix_frozen}/bin/mpifort-${mpi}-gcc${suffix} }
</span> }
} elseif {[regexp {^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-default$} $compiler -> mpi]} {
switch $type {
cc -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/mpicc-${mpi}-mp }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc { return ${prefix_frozen}/bin/mpicc-${mpi}-mp }
</span> cxx -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/mpicxx-${mpi}-mp }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objcxx { return ${prefix_frozen}/bin/mpicxx-${mpi}-mp }
</span> }
}
# Fallbacks
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 91fc517..7abac19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,22 +210,22 @@ proc portfetch::set_fetch_type {option action args} {
</span> }
proc portfetch::find_svn_path {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix os.platform os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix_frozen os.platform os.major
</span> # Sierra is the first macOS version whose svn supports modern TLS cipher suites.
if {${os.major} >= 16 || ${os.platform} ne "darwin"} {
return [findBinary svn $portutil::autoconf::svn_path]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${prefix}/bin/svn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${prefix_frozen}/bin/svn
</span> }
}
proc portfetch::find_git_path {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix os.platform os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix_frozen os.platform os.major
</span> # Mavericks is the first OS X version whose git supports modern TLS cipher suites.
if {${os.major} >= 13 || ${os.platform} ne "darwin"} {
return [findBinary git $portutil::autoconf::git_path]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${prefix}/bin/git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${prefix_frozen}/bin/git
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -485,7 +485,7 @@ proc portfetch::gitfetch {args} {
</span>
# Perform a mercurial fetch.
proc portfetch::hgfetch {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global worksrcpath prefix_frozen patchfiles hg.url hg.tag hg.cmd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global worksrcpath patchfiles hg.url hg.tag hg.cmd \
</span> fetch.ignore_sslcert
set insecureflag ""
<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 a153817..2b6e356 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;'>@@ -1319,7 +1319,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 prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_version prefix_frozen
</span> set portname $subport
set result 0
set skipped 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1463,7 +1463,7 @@ proc target_run {ditem} {
</span> }
# Add ccache port for access to ${prefix}/bin/ccache binary if it exists
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.ccache] && [file exists ${prefix}/bin/ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.ccache] && [file exists ${prefix_frozen}/bin/ccache]} {
</span> set name [_get_dep_port path:bin/ccache:ccache]
lappend deplist $name
set deplist [recursive_collect_deps $name $deplist]
</pre><pre style='margin:0'>
</pre>