<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/85d5e10e1fbfc30ad7f7214f2d0b277023213820">https://github.com/macports/macports-base/commit/85d5e10e1fbfc30ad7f7214f2d0b277023213820</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 85d5e10e Tell the user about more logs if configure fails
</span>85d5e10e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 85d5e10e1fbfc30ad7f7214f2d0b277023213820
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Apr 23 06:57:43 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Tell the user about more logs if configure fails
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If configure fails we previously referred the user to the config.log if
</span><span style='display:block; white-space:pre;color:#404040;'> it exists. Now also refer the user to CMakeError.log and meson-log.txt
</span><span style='display:block; white-space:pre;color:#404040;'> if they exist.
</span>---
src/port1.0/portconfigure.tcl | 8 +++++---
1 file changed, 5 insertions(+), 3 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 288030b3..1b30f446 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;'>@@ -1770,9 +1770,11 @@ proc portconfigure::configure_main {args} {
</span>
# Execute the command (with the new environment).
if {[catch {command_exec {*}${callback} configure} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${configure.dir}/config.log]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "[format [msgcat::mc "Failed to configure %s, consult %s/config.log"] [option subport] ${configure.dir}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.dir build.dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach error_log [list ${configure.dir}/config.log ${configure.dir}/CMakeFiles/CMakeError.log ${build.dir}/meson-logs/meson-log.txt] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${error_log}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "[format [msgcat::mc "Failed to configure %s: consult %s"] [option subport] ${error_log}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
return -code error "[format [msgcat::mc "%s failure: %s"] configure $result]"
}
</pre><pre style='margin:0'>
</pre>