<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/651c9d094d72a6a330cbe576958681104e6bf2a1">https://github.com/macports/macports-base/commit/651c9d094d72a6a330cbe576958681104e6bf2a1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 651c9d094d72a6a330cbe576958681104e6bf2a1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Sep 29 02:14:12 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> add_compiler_port_dependencies code cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Code adding gcc to depends_build was redundant as it was already done
</span><span style='display:block; white-space:pre;color:#404040;'> earlier.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit f2286644a6c9a47bc5e1b7798e51901dcb8192dd)
</span>---
src/port1.0/portconfigure.tcl | 15 +++++----------
1 file changed, 5 insertions(+), 10 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 4a70876..a10c0e0 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;'>@@ -1357,9 +1357,6 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span> set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Adding depends_build port:$compiler_port"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:$compiler_port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:$compiler_port
</span> foreach libgcc_dep $libgccs {
ui_debug "Adding depends_lib $libgcc_dep"
depends_lib-delete $libgcc_dep
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1371,13 +1368,11 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span> ui_debug "Adding depends_lib path:lib/libgcc/libgcc_s.1.dylib:libgcc"
depends_lib-delete "path:lib/libgcc/libgcc_s.1.dylib:libgcc"
depends_lib-append "path:lib/libgcc/libgcc_s.1.dylib:libgcc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[option configure.cxx_stdlib] eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libc++ does not exist on these systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Adding depends_lib libcxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete "port:libcxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append "port:libcxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[option configure.cxx_stdlib] eq "libc++" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libc++ does not exist on these systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Adding depends_lib libcxx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete "port:libcxx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append "port:libcxx"
</span> }
}
}
</pre><pre style='margin:0'>
</pre>