<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/54e8ae5da0c34598fc42fa19201b73fd46f264b9">https://github.com/macports/macports-ports/commit/54e8ae5da0c34598fc42fa19201b73fd46f264b9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 54e8ae5da0c34598fc42fa19201b73fd46f264b9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 29 12:32:54 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> makefile PG: do not set up during configure phase
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> makefile_pg::setup_phase essentially duplicates base code run
</span><span style='display:block; white-space:pre;color:#404040;'> during the configure phase.
</span><span style='display:block; white-space:pre;color:#404040;'> Therefore, there is no reason to run it during the configure phase.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The duplicate code can even corrupt the environment
</span><span style='display:block; white-space:pre;color:#404040;'> variable PKG_CONFIG_PATH.
</span>---
_resources/port1.0/group/makefile-1.0.tcl | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/makefile-1.0.tcl b/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 27b352b9490..e4626159a5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,11 +222,10 @@ proc makefile_pg::setup_phase {phase} {
</span> }
proc makefile_pg::makefile_setup {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option use_configure] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makefile_pg::setup_phase configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # `makefile_pg::setup_phase configure` intentionally not run.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # makefile_pg::setup_phase essentially duplicates base code run during the configure phase.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Therefore, there is no reason to run it during the configure phase.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The duplicate code can even corrupt the environment variable PKG_CONFIG_PATH.
</span> pre-build {
makefile_pg::setup_phase build
}
</pre><pre style='margin:0'>
</pre>