<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/fda5fea279e13a3eb00f88157a46974a05b01dc5">https://github.com/macports/macports-base/commit/fda5fea279e13a3eb00f88157a46974a05b01dc5</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 fda5fea Don't fail without a copy of the official ports tree
</span>fda5fea is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fda5fea279e13a3eb00f88157a46974a05b01dc5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Feb 14 22:12:41 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> Don't fail without a copy of the official ports tree
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Keep a fallback copy of the code under _resources/port1.0/compilers in
</span><span style='display:block; white-space:pre;color:#404040;'> the ports tree in base. This little bit of redundancy lets us keep
</span><span style='display:block; white-space:pre;color:#404040;'> the ability to update compiler choices via the ports tree, while still
</span><span style='display:block; white-space:pre;color:#404040;'> allowing operation without it (including while running our tests).
</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/57947
</span>---
src/port1.0/portconfigure.tcl | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 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 ecd6128..4565edb 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;'>@@ -912,8 +912,24 @@ proc portconfigure::get_clang_compilers {} {
</span> if {[file exists ${compiler_file}]} {
source ${compiler_file}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Clang compilers file not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "${compiler_file} does not exist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "clang_compilers.tcl not found in ports tree, using built-in selections"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-7.0 macports-clang-6.0 macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/d387f4e4a47b298b1775ea8bf61772e2c2e6cd8b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The High Sierra SDK requires a toolchain that can apply nullability to uuid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The Sierra SDK requires a toolchain that supports class properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-3.3
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
return ${compilers}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -925,8 +941,12 @@ proc portconfigure::get_gcc_compilers {} {
</span> if {[file exists ${compiler_file}]} {
source ${compiler_file}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "GCC compilers file not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "${compiler_file} does not exist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "gcc_compilers.tcl not found in ports tree, using built-in selections"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/57135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-gcc-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-gcc-7 macports-gcc-6 macports-gcc-5
</span> }
return ${compilers}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1329,8 +1349,17 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span> if {[file exists ${dependencies_file}]} {
source ${dependencies_file}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "GCC dependencies file not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "${dependencies_file} does not exist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "gcc_dependencies.tcl not found in ports tree, using built-in data"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compiler links against libraries in libgcc\d* and/or libgcc-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${gcc_version} 4.6] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc7 port:libgcc6 port:libgcc45"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${gcc_version} 7] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc7 port:libgcc6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${gcc_version} 8] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
ui_debug "Adding depends_build port:$compiler_port"
depends_build-delete port:$compiler_port
</pre><pre style='margin:0'>
</pre>