<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.7
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/18f2fed5af5c0441b93f032818a03f0e0fb8e1c5">https://github.com/macports/macports-base/commit/18f2fed5af5c0441b93f032818a03f0e0fb8e1c5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 18f2fed5af5c0441b93f032818a03f0e0fb8e1c5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Apr 23 06:55:19 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Check more logs for implicit function declarations
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously we only checked the config.log in configure.dir but that left
</span><span style='display:block; white-space:pre;color:#404040;'> out projects that use more than one configure script, ports that use the
</span><span style='display:block; white-space:pre;color:#404040;'> muniversal portgroup, and ports that use build systems other than
</span><span style='display:block; white-space:pre;color:#404040;'> autotools. Now check the entire workpath and look not only for
</span><span style='display:block; white-space:pre;color:#404040;'> config.log but also for CMakeError.log and meson-log.txt.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 2bfad62ade3f26e8846c9b63297b9b32c155ee10)
</span>---
src/port1.0/portconfigure.tcl | 8 ++++----
1 file changed, 4 insertions(+), 4 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 aede48c4..75902757 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;'>@@ -1787,21 +1787,21 @@ default configure.checks.implicit_function_declaration.whitelist {[portconfigure
</span>
proc portconfigure::check_implicit_function_declarations {} {
global \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workpath \
</span> configure.checks.implicit_function_declaration.whitelist
# Map from function name to config.log that used it without declaration
array set undeclared_functions {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse -tails file [list ${configure.dir}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file tail $file] eq "config.log" && [file isfile [file join ${configure.dir} $file]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse -tails file [list ${workpath}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file tail $file] in [list config.log CMakeError.log meson-log.txt] && [file isfile [file join ${workpath} $file]]} {
</span> # We could do the searching ourselves, but using a tool optimized for this purpose is likely much faster
# than using Tcl.
#
# Using /usr/bin/fgrep here, so we don't accidentally pick up a macports-installed grep which might
# currently not be runnable due to a missing library.
set args [list "/usr/bin/fgrep" "--" "-Wimplicit-function-declaration"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend args [file join ${configure.dir} $file]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend args [file join ${workpath} $file]
</span>
if {![catch {set result [exec -- {*}$args]}]} {
foreach line [split $result "\n"] {
</pre><pre style='margin:0'>
</pre>